wwww working on it! wwww

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index b833f7ce3c91d75bca738db09a49f2fa9fbcb84e..8f77a4f005a493617b641926ad998ebc4036384f 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -64,7 +64,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 \r
 #define TILEWH 16\r
 #define QUADWH                 TILEWH/2\r
-#define SPEED 16\r
+#define SPEED 4\r
 //#define LOOPMAX (TILEWH/SPEED)\r
 \r
 //place holder definitions\r
@@ -533,6 +533,74 @@ void main() {
                player.triggery = player.ty-1;\r
        }\r
        //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
+
+/*     //right movement\r
+       if((keyp(32) && !keyp(30) && player.d == 0) || player.d == 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
+                       {
+                               bg->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
+       }\r
+\r
+       //left movement\r
+       if((keyp(30) && !keyp(32) && player.d == 0) || player.d == 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
+                       {\r
+                               bg->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
+       }\r
+\r
+       //down movement\r
+       if((keyp(31) && !keyp(17) && player.d == 0) || player.d == 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
+                       {\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
+\r
+       //up movement\r
+       if((keyp(17) && !keyp(31) && player.d == 0) || player.d == 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
+                       {\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
        if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))\r
        {\r
@@ -546,7 +614,7 @@ void main() {
        if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }\r
        //if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }\r
        if(keyp(25)){ pdump(bg); pdump(spri); }\r
-       if(keyp(24)){ modexPalUpdate3(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
+       if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }\r
        if(keyp(22)){ \r
        paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);\r
        printf("1paloffset      =       %d\n", paloffset/3);\r
@@ -932,5 +1000,5 @@ animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, s
        //modexClearRegion(top->page, 66, 66, 2, 40, 0);\r
        //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);\r
        //turn this off if XT\r
-       //if(detectcpu() > 0) modexWaitBorder();\r
+       if(detectcpu() > 0) modexWaitBorder();\r
 }\r