We can now see the map data at the player position! ^^

	modified:   scroll.exe
	modified:   src/scroll.c

diff --git a/scroll.exe b/scroll.exe
index afec11337a9deb64bbbbfae94f9a339f2754dac1..f1815d58f3dea2eb964d2f5d9a685474860a85b9 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/scroll.c b/src/scroll.c
index 215f968ccacb3ba2c3d3a8d54abf5cca7fe42a07..b27f329869a34c2e2954533aa8a99cb2ff899da9 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -77,7 +77,8 @@ void main() {
        size_t oldfreemem=GetFreeSize();\r
        long emmhandle;\r
        long emsavail;\r
-       char teststr[80];\r
+       char teststr[80];
+       word panswitch=0, panq=1, pand=0; //for panning!\r
        int i;\r
        static word paloffset=0;\r
        bitmap_t ptmp;//, npctmp; // player sprite\r
@@ -368,7 +369,8 @@ void main() {
 */\r
 \r
        //player movement\r
-       //TODO: make movement into a function!\r
+       //TODO: make movement into a function!
+       if(!panswitch){\r
        //right movement\r
        if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)\r
        {\r
@@ -533,77 +535,61 @@ void main() {
                player.triggery = player.ty-1;\r
        }\r
        //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
-
-
+}else{
 //88 switch!
-/*     //right movement\r
-       if((keyp(32) && !keyp(30) && player.d == 0) || player.d == 2)\r
+       //right movement\r
+       if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)\r
        {\r
-               if(player.d == 0){ player.d = 2; }\r
-               if(bg->tx >= 0 && bg->tx+20 < map.width)\r
-               {\r
-                       if(player.q<=(TILEWH/SPEED))\r
+               if(pand == 0){ pand = 2; }\r
+                       if(panq<=(TILEWH/SPEED))\r
                        {
                                bg->page->dx++;
+                               spri->page->dx++;
                                modexShowPage(bg->page);
-                               player.q++;\r
-                       } else { player.q = 1; player.d = 0; }\r
-               }\r
-//             player.triggerx = player.tx+1;\r
-//             player.triggery = player.ty;\r
+                               modexShowPage(spri->page);
+                               panq++;\r
+                       } else { panq = 1; pand = 0; }\r
        }\r
-\r
        //left movement\r
-       if((keyp(30) && !keyp(32) && player.d == 0) || player.d == 4)\r
+       if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)\r
        {\r
-               if(player.d == 0){ player.d = 4; }\r
-               if(bg->tx > 0 && bg->tx+20 <= map.width)\r
-               {\r
-                       if(player.q<=(TILEWH/SPEED))\r
+               if(pand == 0){ pand = 4; }\r
+                       if(panq<=(TILEWH/SPEED))\r
                        {\r
                                bg->page->dx--;
+                               spri->page->dx--;
                                modexShowPage(bg->page);
-                               player.q++;\r
-                       } else { player.q = 1; player.d = 0; }\r
-               }\r
-               //player.triggerx = player.tx-1;\r
-               //player.triggery = player.ty;\r
+                               modexShowPage(spri->page);
+                               panq++;\r
+                       } else { panq = 1; pand = 0; }\r
        }\r
-\r
        //down movement\r
-       if((keyp(31) && !keyp(17) && player.d == 0) || player.d == 3)\r
+       if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)\r
        {\r
-               if(player.d == 0){ player.d = 3; }\r
-               if(bg->ty >= 0 && bg->ty+15 < map.height)\r
-               {\r
-                       if(player.q<=(TILEWH/SPEED))\r
+               if(pand == 0){ pand = 3; }\r
+                       if(panq<=(TILEWH/SPEED))\r
                        {\r
                                bg->page->dy--;
-                               modexShowPage(bg->page);\r
-                               player.q++;\r
-                       } else { player.q = 1; player.d = 0; }\r
-               }\r
-               //player.triggerx = player.tx;\r
-               //player.triggery = player.ty+1;\r
+                               spri->page->dy--;
+                               modexShowPage(bg->page);
+                               modexShowPage(spri->page);
+                               panq++;\r
+                       } else { panq = 1; pand = 0; }\r
        }\r
-\r
        //up movement\r
-       if((keyp(17) && !keyp(31) && player.d == 0) || player.d == 1)\r
+       if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)\r
        {\r
-               if(player.d == 0){ player.d = 1; }\r
-               if(bg->ty > 0 && bg->ty+15 <= map.height)\r
-               {\r
-                       if(player.q<=(TILEWH/SPEED))\r
+               if(pand == 0){ pand = 1; }\r
+                       if(panq<=(TILEWH/SPEED))\r
                        {\r
                                bg->page->dy++;
-                               modexShowPage(bg->page);\r
-                               player.q++;\r
-                       } else { player.q = 1; player.d = 0; }\r
-               }\r
-               //player.triggerx = player.tx;\r
-               //player.triggery = player.ty-1;\r
-       }*/
-\r
+                               spri->page->dy++;
+                               modexShowPage(bg->page);
+                               modexShowPage(spri->page);\r
+                               panq++;\r
+                       } else { panq = 1; pand = 0; }\r
+       }
+}\r
        if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        {\r
                short i;\r
@@ -622,8 +608,9 @@ void main() {
        printf("1paloffset      =       %d\n", paloffset/3);\r
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
        printf("2paloffset      =       %d\n", paloffset/3);\r
-        pdump(bg); pdump(spri); }\r
+        pdump(bg); pdump(spri); }
 \r
+       if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }\r
        if(keyp(87))\r
        {\r
                modexLeave();\r
@@ -646,18 +633,14 @@ void main() {
        //system("mem /E /P");\r
        printf("Project 16 scroll.exe\n");\r
        printf("tx: %d\n", bg->tx);\r
-       printf("ty: %d\n", bg->ty);\r
-       printf("player.x: %d", player.x);\r
-       if(player.hp==0) printf("%d wwww\n", player.y+8);\r
-       else printf("\nplayer.y: %d\n", player.y);\r
-       printf("player.tx: %d\n", player.tx);\r
-       printf("player.ty: %d\n", player.ty);\r
-       printf("player.triggx: %d\n", player.triggerx);\r
-       printf("player.triggy: %d\n", player.triggery);\r
-       printf("player.hp: %d\n", player.hp);\r
-       printf("player.q: %d\n", player.q);\r
-       printf("player.d: %d\n", player.d);
-       printf("tile data value at player pos: %d\n", player.tx+(player.tx*player.ty));//bg->map->data[]);\r
+       printf("ty: %d\n", bg->ty);
+       printf("player.x: %d", player.x); printf("              player.y: %d\n", player.y);\r
+       //if(player.hp==0) printf("%d wwww\n", player.y+8);\r
+       //else printf("\nplayer.y: %d\n", player.y);\r
+       printf("player.tx: %d", player.tx); printf("            player.ty: %d\n", player.ty);\r
+       printf("player.triggx: %d", player.triggerx); printf("  player.triggy: %d\n", player.triggery);\r
+       printf("player.hp: %d", player.hp);     printf("        player.q: %d", player.q);       printf("        player.d: %d\n", player.d);
+       printf("tile data value at player pos: %d\n", bg->map->data[(player.tx-1)+(map.width*(player.ty-1))]);\r
        printf("palette offset: %d\n", paloffset/3);\r
        printf("Total used: %zu\n", oldfreemem-GetFreeSize());\r
        printf("Total free: %zu\n", GetFreeSize());\r