[16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 888a00341c67bed7dffab102e30475518044f91a..38516c990cdfe807bf5acf742680c5813188797e 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -137,7 +137,7 @@ void main(int argc, char *argv[])
 #endif\r
        }\r
 \r
-//     while(!IN_KeyDown(sc_Escape) && !IN_KeyDown(sc_Space) && !IN_KeyDown(sc_Enter)){ FUNCTIONKEYSHOWMV }\r
+//     while(!gvar.in.inst->Keyboard[sc_Escape) && !gvar.in.inst->Keyboard[sc_Space) && !gvar.in.inst->Keyboard[sc_Enter]){ FUNCTIONKEYSHOWMV }\r
        gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
        shinku(&gvar);\r
@@ -145,7 +145,7 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
        modexFadeOn(4, &gvar.video.palette);\r
 #endif\r
-       while(!IN_KeyDown(sc_Escape) && gvar.player[0].enti.hp>0)\r
+       while(!gvar.in.inst->Keyboard[sc_Escape] && gvar.player[0].enti.hp>0)\r
        {\r
                gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
                gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
@@ -165,8 +165,8 @@ void main(int argc, char *argv[])
                }\r
 \r
                //the scripting stuff....\r
-               //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
-               if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && IN_KeyDown(0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+               //if(((gvar.player[0].enti.triggerx == TRIGGX && gvar.player[0].enti.triggery == TRIGGY) && gvar.in.inst->Keyboard[0x1C))||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
+               if(((gvar.mv[0].map->layerdata[0].data[(gvar.player[0].enti.triggerx-1)+(map.width*(gvar.player[0].enti.triggery-1))] == 0) && gvar.in.inst->Keyboard[0x1C])||(gvar.player[0].enti.tx == 5 && gvar.player[0].enti.ty == 5))\r
                {\r
                        short i;\r
                        for(i=800; i>=400; i--)\r
@@ -178,21 +178,21 @@ void main(int argc, char *argv[])
                if(gvar.player[0].enti.q == (TILEWH/(gvar.player[0].enti.speed))+1 && gvar.player[0].info.dir != 2 && (gvar.player[0].enti.triggerx == 5 && gvar.player[0].enti.triggery == 5)){ gvar.player[0].enti.hp--; }\r
                //debugging binds!\r
 \r
-               if(IN_KeyDown(24)){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
-               if(IN_KeyDown(22)){ modexPalUpdate0(&gvar.video.palette); } //u\r
+               if(gvar.in.inst->Keyboard[24]){ modexPalUpdate0(&gvar.video.palette); /*paloffset=0;*/ modexpdump(gvar.mv[0].page); IN_UserInput(1, &gvar); } //o\r
+               if(gvar.in.inst->Keyboard[22]){ modexPalUpdate0(&gvar.video.palette); } //u\r
 \r
                TAIL_FUNCTIONKEYFUNCTIONS\r
                TAIL_FUNCTIONKEYDRAWJUNK\r
-               if(IN_KeyDown(sc_L)){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }\r
-               if(IN_KeyDown(sc_J) || IN_KeyDown(sc_K))\r
+               if(gvar.in.inst->Keyboard[sc_L]){ modexClearRegion(&gvar.video.page[0], gvar.player[0].enti.x, gvar.player[0].enti.y, 16, 16, 1); }\r
+               if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K])\r
                {\r
-                       if(IN_KeyDown(sc_J))\r
+                       if(gvar.in.inst->Keyboard[sc_J])\r
                        {\r
                                bakapee1=FILENAME_1;\r
                                bakapee1p=FILENAME_1P;\r
                                gvar.player[0].enti.overdraww=0;\r
                        }\r
-                       if(IN_KeyDown(sc_K))\r
+                       if(gvar.in.inst->Keyboard[sc_K])\r
                        {\r
                                bakapee1=FILENAME_2;\r
                                bakapee1p=FILENAME_2P;\r
@@ -203,9 +203,9 @@ void main(int argc, char *argv[])
                        VL_LoadPalFile(bakapee1p, &gvar.video.palette);\r
                }//JK\r
 #ifdef FADE\r
-               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r
+               if(gvar.in.inst->Keyboard[10]){ modexPalOverscan(rand()%56); modexPalUpdate(gvar.video.dpal); IN_UserInput(1, &gvar); }\r
 #endif\r
-               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+               if(gvar.in.inst->Keyboard[sc_R]){ modexPalOverscan(rand()%56); } //r\r
 \r
                if((gvar.player[0].enti.q==1) && !(gvar.player[0].enti.x%TILEWH==0 && gvar.player[0].enti.y%TILEWH==0)) Quit(&gvar, "PLAYER OFF THE RAILS!");//break;   //incase things go out of sync!\r
        }\r
@@ -218,7 +218,7 @@ void main(int argc, char *argv[])
        modexFadeOff(4, &gvar.video.palette);\r
 #endif\r
        Shutdown16(&gvar);\r
-       printf("\nProject 16 zcroll.exe. This is just a test file!\n");\r
+       printf("\nProject 16 xcroll.exe. This is just a test file!\n");\r
        printf("version %s\n", VERSION);\r
        SCROLLEXITMESG;\r
        WCPU_cpufpumesg();\r