whent back to copy page wwww

[16.git] / src / scroll.c

diff --git a/src/scroll.c b/src/scroll.c
index b108a20d6fd7901e052f454e6b70f3fc4a4082ef..4bb417967835c5783096b0c4396eb2a1a5061856 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -91,6 +91,7 @@ void main(int argc, char *argv[])
 #endif
        }
        _DEBUG("Serial debug output started\n"); // NTS: All serial output must end messages with newline, or DOSBox-X will not emit text to log
+       _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);
 
        pan.pn=1;
        //player[0].data = &pp;
@@ -189,6 +190,7 @@ void main(int argc, char *argv[])
        //IN_initplayer(&player, 1);
 
 #ifndef        SPRITE
+       modexClearRegion(mv[0].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
        modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
 #else
        //PBUFSFUN(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
@@ -220,7 +222,6 @@ void main(int argc, char *argv[])
                //printf("      player[0].q: %d", player[0].q); printf("        player[0].d: %d\n", player[0].d);
        }
 
-
        //the scripting stuff....
        //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
        if(((mv[0].map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
@@ -234,31 +235,32 @@ void main(int argc, char *argv[])
        }
        if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
        //debugging binds!
-       if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; }
-       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; }
-       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; }
-       if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; }
+       if(IN_KeyDown(2)){ modexShowPage(mv[0].page); pan.pn=0; IN_UserInput(1,1); }
+       if(IN_KeyDown(3)){ modexShowPage(mv[1].page); pan.pn=1; IN_UserInput(1,1); }
+       if(IN_KeyDown(4)){ modexShowPage(mv[2].page); pan.pn=2; IN_UserInput(1,1); }
+       if(IN_KeyDown(4+1)){ modexShowPage(mv[3].page); pan.pn=3; IN_UserInput(1,1); }
        if(IN_KeyDown(25)){ modexpdump(mv[0].page); modexpdump(mv[1].page);
-               //IN_Ack();
+                IN_UserInput(1,1);
        }       //p
 #ifdef MODEX
 #ifdef FADE
-       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); }
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page);  IN_UserInput(1,1); }
        if(IN_KeyDown(22)){
        paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
        printf("1paloffset      =       %d\n", paloffset/3);
         modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
        printf("2paloffset      =       %d\n", paloffset/3);
-        modexpdump(mv[0].page); modexpdump(mv[1].page); }
+        modexpdump(mv[0].page); modexpdump(mv[1].page);
+               IN_UserInput(1,1);
+       }
 #endif
 #endif
        //pan switch
-       if(IN_KeyDown(88)){panswitch=!panswitch;}       //f12
-       //TSR
+       if(IN_KeyDown(88)){panswitch=!panswitch; IN_UserInput(1,1);}    //f12
        if(IN_KeyDown(87))      //f11
        {
                pageflipflop=!pageflipflop;
-               //IN_Ack();
+               IN_UserInput(1,1);
 //             VGAmodeX(0, 0, &gvar);
 //             IN_Shutdown();
 //             __asm
@@ -267,10 +269,10 @@ void main(int argc, char *argv[])
 //                     int 21h
 //             }
        }
-       if(IN_KeyDown(68))      //s
+       if(IN_KeyDown(68))      //f10
        {
                gvar.kurokku.fpscap=!gvar.kurokku.fpscap;
-               //IN_Ack();
+               IN_UserInput(1,1);
        }
        //TODO fmemtest into page
        /*if(IN_KeyDown(4+1))   //4
@@ -281,8 +283,8 @@ void main(int argc, char *argv[])
        }*/
 
        //9
-       if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
-       //if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
+       if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(default_pal); IN_UserInput(1,1); }
+       //if(IN_KeyDown(11)){ modexPalOverscan(15); }
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!
        }
 
@@ -320,8 +322,11 @@ void main(int argc, char *argv[])
        printf("tile resolution: %dx", gvar.video.page[0].tw);  printf("%d \n", gvar.video.page[0].th);
        printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);      printf("%d\n", gvar.video.page[0].tilemidposscreeny);
        modexprintmeminfo(&gvar.video);
-       printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("        mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty); printf("gvar.video.p=%u\n", gvar.video.p);
-       //printf("player[1].q: %d", player[1].q);       printf("        player[1].d: %d\n", player[1].d);
+       //printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("      mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty);
+       printf("gvar.video.p=%u ", gvar.video.p); printf("gvar.video.r=%u ", gvar.video.r);
+       printf("pageflipflop=%u\n", pageflipflop);
+       printf("\ngvar.video.tickclk=%f\n", gvar.video.tickclk);
+       printf("gvar.video.clk=%f", gvar.video.clk);
        printf("\n");
        //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);