modified: 16/modex16/scroll.c

	modified:   16/modex16/scroll.exe
Finalizing the player movement!

diff --git a/16/modex16/scroll.c b/16/modex16/scroll.c
index 42655ffa6312ac67fd5fc66fea8b9293bb43a3ef..ece6edfb429f4d4c54d9cc5e4538485e1eabea00 100644 (file)
--- a/16/modex16/scroll.c
+++ b/16/modex16/scroll.c
@@ -58,13 +58,11 @@ void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
 #define SPEED 2
 
 //place holder definitions
-#define MAPX 24
-#define MAPY 19\r
+#define MAPX 40
+#define MAPY 30\r
 //#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
 void main() {\r
        bitmap_t bmp;\r
-//     int tx, ty;\r
-//     int x, y;\r
        int q=0;\r
        page_t screen;//,screen2;\r
        map_t map;\r
@@ -97,9 +95,10 @@ void main() {
 //     draw = &mv2;\r
        draw = &mv;
 
+//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
        mapGoTo(draw, 0, 0);\r
-\r
-       //TODO: set player position data here according to the viewable map screen thingy\r
+
+       //TODO: put player in starting position of spot\r
        //default player position on the viewable map
        player.tx = draw->tx + 10;
        player.ty = draw->ty + 8;
@@ -109,12 +108,12 @@ void main() {
        modexShowPage(draw->page);\r
        while(!keyp(1))
        {\r
-       //TODO: top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
+       //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
        //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
        //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
        if(keyp(77))
        {
-               if(draw->tx >= 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
+               if(draw->tx >= 0 && draw->tx+20 < MAPX && player.tx == draw->tx + 10)
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
@@ -123,8 +122,9 @@ void main() {
 //             mapScrollRight(draw, 1);\r
 //             SWAP(draw, show);\r
                        }
+                       player.tx++;
                }
-               else if(player.tx < draw->tx+20 && player.tx >= draw->tx + 10)// && player.tx <= draw->tx+10)
+               else if(player.tx < MAPX)
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
@@ -137,7 +137,7 @@ void main() {
        }\r
 \r
        if(keyp(75)){
-               if(draw->tx >= 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
+               if(draw->tx > 0 && draw->tx+20 <= MAPX && player.tx == draw->tx + 10)
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
@@ -145,9 +145,10 @@ void main() {
                                modexShowPage(draw->page);\r
 //             mapScrollLeft(show, 1);\r
 //             SWAP(draw, show);\r
-                       }\r
+                       }
+                       player.tx--;\r
                }
-               else if(player.tx > 0 && player.tx <= draw->tx + 10)// && player.tx >= draw->tx+10)
+               else if(player.tx > 0)
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
@@ -161,7 +162,7 @@ void main() {
 \r
        if(keyp(80))
        {
-               if(draw->ty >= 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
+               if(draw->ty >= 0 && draw->ty+15 < MAPY && player.ty == draw->ty + 8)
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
@@ -170,8 +171,9 @@ void main() {
 //             mapScrollDown(show, 1);\r
 //             SWAP(draw, show);\r
                        }
+                       player.ty++;
                }
-               else if(player.ty < draw->ty+15 && player.ty >= draw->ty + 8)// && player.ty <= draw->ty+8)
+               else if(player.ty < MAPY)
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {
@@ -185,7 +187,7 @@ void main() {
 \r
        if(keyp(72))
        {
-               if(draw->ty >= 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
+               if(draw->ty > 0 && draw->ty+15 <= MAPY && player.ty == draw->ty + 8)
                {\r
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {\r
@@ -194,8 +196,9 @@ void main() {
 //             mapScrollUp(show, 1);\r
 //             SWAP(draw, show);\r
                        }
+                       player.ty--;
                }
-               else if(player.ty > 0 && player.ty <= draw->ty + 8)// && player.ty >= draw->ty+8)
+               else if(player.ty > 0)// && player.ty <= draw->ty + 8)// && player.ty >= draw->ty+8)
                {
                        for(q=0; q<(TILEWH/SPEED); q++)
                        {

diff --git a/16/modex16/scroll.exe b/16/modex16/scroll.exe
index e8303da0321b9eaf4429a0758dfa0042874661fc..0b089452463d1112ada45a50d35dd87beb527eec 100755 (executable)
Binary files a/16/modex16/scroll.exe and b/16/modex16/scroll.exe differ