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

diff --git a/src/0.c b/src/0.c
index 96d8e7aa0553f5f0061cfd473c3af4fdcb463537..051bb332fe8be6ff3e01a5e3d1f84e7a54658b20 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -138,18 +138,18 @@ int main(int argc,char **argv)
                /* do it */\r
                omemptr = vga_state.vga_graphics_ram; // save original mem ptr\r
 \r
-               while(!IN_KeyDown(sc_Escape))\r
+               while(!gvar.in.inst->Keyboard[sc_Escape])\r
                {\r
                        IN_ReadControl(&gvar.player[0], &gvar);\r
-                       if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
+                       if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10\r
                        TAIL_PANKEYFUN;\r
-                       if(IN_KeyDown(sc_Space) || zerostoppause)       //space\r
+                       if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause)   //space\r
                        {\r
                                anim=!anim;\r
                                DRAWCORNERBOXES;\r
                                if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0;\r
                        }\r
-                       if(IN_KeyDown(sc_R)){\r
+                       if(gvar.in.inst->Keyboard[sc_R]){\r
                                gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16;\r
                                gvar.mv[0].tx = gvar.mv[0].ty = gvar.mv[1].tx = gvar.mv[1].ty = INITTNUM;\r
                                VL_ShowPage(&gvar.video.page[gvar.video.sp], 1, 0);\r

diff --git a/src/16.c b/src/16.c
index 9d05514f01baafae30249e95acf26090ed900143..7f22e1b6eafaeea9188a52557a52ba27e0114b6e 100755 (executable)
--- a/src/16.c
+++ b/src/16.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
        while(1)\r
        {\r
                IN_ReadControl(&gvar.player[0], &gvar);\r
-               if(IN_KeyDown(sc_Escape)) break;\r
+               if(gvar.in.inst->Keyboard[sc_Escape]) break;\r
                shinku(&gvar);\r
                _DEBUGF("Serial debug output printf test %u %u %u\n",1U,2U,3U);\r
        }\r

diff --git a/src/inputest.c b/src/inputest.c
index 56370b7453098636e7485ea9796fd96e01e397f8..65fafd87e63b68a11a067faf0a7486e8f3757774 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -49,7 +49,7 @@ ctrl_Keyboard1);
 //0000 nibbletest();\r
 //0000 booleantest();\r
        //printf("dbg_testkeyin=%u      dbg_testcontrolnoisy=%u dbg_nogvar.playerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_nogvar.playerinpu);\r
-       while(!IN_KeyDown(sc_Escape))\r
+       while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r
 //0000         shinkutxt(&gvar);\r
                IN_ReadControl(&gvar.player[0], &gvar);\r
@@ -87,10 +87,9 @@ ctrl_Keyboard1);
                        } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
                break;\r
        }\r
-               //printf("%u\n", IN_KeyDown(sc_Escape));\r
+               //printf("%u\n", gvar.in.inst->Keyboard[sc_Escape]);\r
                //if(\r
-               IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));\r
-               if(IN_KeyDown(88))      //speed\r
+               if(gvar.in.inst->Keyboard[88])  //speed\r
                {\r
                        switch(gvar.kurokku.fpscap)\r
                        {\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 97a560d0e998168a09c4a2d9b88aedb62ff83618..14c88c05a06203a933b28510d311e0eb6adc6470 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -250,8 +250,8 @@ void IN_StopDemo(void);
 void IN_FreeDemoBuffer(void);\r
 #endif\r
 \r
-boolean        IN_KeyDown(byte code),\r
-               IN_qb(byte kee);\r
+//boolean      IN_KeyDown(byte code),\r
+//             IN_qb(byte kee);\r
 void           IN_ClearKey(byte code),\r
                IN_KbdLED();\r
 ScanCode       IN_GetLastScan(),\r

diff --git a/src/lib/16_tail.h b/src/lib/16_tail.h
index 81c5e1a0b54f2c7f1bb1df6445ea9eb2d2846bf7..d31cac10c7d951e1762e21dacce1d55d0697bacf 100755 (executable)
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -34,34 +34,34 @@
 #include "src/lib/testpatt.h"\r
 \r
 #define TAIL_FUNCTIONKEYFUNCTIONS \\r
-       if(IN_KeyDown(88)){ panswitch=!panswitch;                                                       IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[88]){ panswitch=!panswitch;                                                   IN_UserInput(1, &gvar); } \\r
        TAIL_FUNCTIONKEYFUNCTIONS0EXE\r
 \r
 #define RFDEBUGFUNCTIONS\r
 #ifdef __DEBUG_RF__\r
 #undef RFDEBUGFUNCTIONS\r
 #define RFDEBUGFUNCTIONS \\r
-       if(IN_KeyDown(sc_F11)){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap;         IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_F9)){ dbg_pagenorendermap=!dbg_pagenorendermap;                        IN_UserInput(1, &gvar); }\r
+       if(gvar.in.inst->Keyboard[sc_F11]){ dbg_pagedelayrendermap=!dbg_pagedelayrendermap;             IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;                    IN_UserInput(1, &gvar); }\r
 #endif\r
 \r
 /*#define SPRIDEBUGFUNCTIONS\r
 #ifdef __DEBUG_SPRI__\r
 #undef SPRIDEBUGFUNCTIONS\r
 #define SPRIDEBUGFUNCTIONS \\r
-       if(IN_KeyDown(sc_Y)){ dbg_delayanimation=!dbg_delayanimation;                           IN_UserInput(1, &gvar); }\r
-//     if(IN_KeyDown(sc_F9)){ dbg_pagenorendermap=!dbg_pagenorendermap;                        IN_UserInput(1, &gvar); }\r
+       if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                               IN_UserInput(1, &gvar); }\r
+//     if(gvar.in.inst->Keyboard[sc_F9]){ dbg_pagenorendermap=!dbg_pagenorendermap;                    IN_UserInput(1, &gvar); }\r
 #endif*/\r
 \r
 #define TAIL_FUNCTIONKEYFUNCTIONS0EXE \\r
-       if(IN_KeyDown(sc_F4)){ turboXT(12);                                                                     IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(68/*sc_F10*/)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;         IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_F8)){ gvar.video.bgps=!gvar.video.bgps;                                        IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_F7)){ ZC_ShowMV(&gvar.mv, 0, 1);                                               IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_F6)){ ZC_ShowMV(&gvar.mv, 0, 0);                                               IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_T)){ gvar.video.rss=!gvar.video.rss;                                           IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_P)){ modexpdump(&gvar.video.page[0]);                                  IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_Y)){ dbg_delayanimation=!dbg_delayanimation;                           IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_F4]){ turboXT(12);                                                                 IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[68/*sc_F10*/]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap;             IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_F8]){ gvar.video.bgps=!gvar.video.bgps;                                    IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_F7]){ ZC_ShowMV(&gvar.mv, 0, 1);                                           IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_F6]){ ZC_ShowMV(&gvar.mv, 0, 0);                                           IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_T]){ gvar.video.rss=!gvar.video.rss;                                               IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_P]){ modexpdump(&gvar.video.page[0]);                                      IN_UserInput(1, &gvar); } \\r
+       if(gvar.in.inst->Keyboard[sc_Y]){ dbg_delayanimation=!dbg_delayanimation;                               IN_UserInput(1, &gvar); } \\r
        RFDEBUGFUNCTIONS\r
 \r
 #define TAIL_PANKEYFUN \\r
@@ -72,28 +72,28 @@
        ZC_panPageManual(&gvar.mv, &gvar.player, 0);\r
 \r
 #define FUNCTIONKEYSHOWMV \\r
-       if(IN_KeyDown(1+1)){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
-       if(IN_KeyDown(2+1)){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
-       if(IN_KeyDown(3+1)){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \\r
-       if(IN_KeyDown(4+1)){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }\r
+       if(gvar.in.inst->Keyboard[1+1]){ gvar.video.sp=0; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
+       if(gvar.in.inst->Keyboard[2+1]){ gvar.video.sp=1; ZC_ShowMV(&gvar.mv, 0, 0); } \\r
+       if(gvar.in.inst->Keyboard[3+1]){ gvar.video.sp=2; ZC_ShowMV(&gvar.mv, 0, 1); } \\r
+       if(gvar.in.inst->Keyboard[4+1]){ gvar.video.sp=3; ZC_ShowMV(&gvar.mv, 0, 1); }\r
 \r
 #define TAIL_FUNCTIONKEYDRAWJUNK \\r
        FUNCTIONKEYSHOWMV \\r
        TAIL_FUNCTIONKEYDRAWJUNKNOMV\r
 \r
 #define TAIL_FUNCTIONKEYDRAWJUNKNOMV \\r
-       if(IN_KeyDown(sc_A)) modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 3); \\r
-       if(IN_KeyDown(sc_S)) modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); \\r
+       if(gvar.in.inst->Keyboard[sc_A]){ modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 3); } \\r
+       if(gvar.in.inst->Keyboard[sc_S]){ modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 4); } \\r
 \\r
-       if(IN_KeyDown(sc_Z)){ DRAWCORNERBOXES } \\r
-       if(IN_KeyDown(sc_X)){ TESTBG12 } \\r
-       if(IN_KeyDown(sc_C)){ TESTBG34 } \\r
-       if(IN_KeyDown(sc_V)) VL_PatternDraw(&gvar.video, 0, 1, 1); \\r
-       if(IN_KeyDown(sc_I)){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); }\r
-/*     if(IN_KeyDown(sc_PgDn)){ \\r
+       if(gvar.in.inst->Keyboard[sc_Z]){ DRAWCORNERBOXES } \\r
+       if(gvar.in.inst->Keyboard[sc_X]){ TESTBG12 } \\r
+       if(gvar.in.inst->Keyboard[sc_C]){ TESTBG34 } \\r
+       if(gvar.in.inst->Keyboard[sc_V]){ VL_PatternDraw(&gvar.video, 0, 1, 1); } \\r
+       if(gvar.in.inst->Keyboard[sc_I]){ dbg_maptext=!dbg_maptext; IN_UserInput(1, &gvar); }\r
+/*     if(gvar.in.inst->Keyboard[sc_PgDn]){ \\r
                rotateR(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \\r
                VL_UpdatePaletteWrite(&gvar.video.palette, 0);          IN_UserInput(1, &gvar); } \\r
-       if(IN_KeyDown(sc_PgUp)){ \\r
+       if(gvar.in.inst->Keyboard[sc_PgUp]){ \\r
                rotateL(gvar.video.palette, sizeof(gvar.video.palette)/sizeof(gvar.video.palette[0])); \\r
                VL_UpdatePaletteWrite(&gvar.video.palette, 0);          IN_UserInput(1, &gvar); }*/\r
 \r

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index f9e8a30b2aeb99c3178a487a5e176abf80abef62..871cf69e80afd377d873976e629e290e37c0bc55 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -310,7 +310,6 @@ typedef struct// inconfig
 //     Global variables\r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       //struct        instat  *inst;\r
        inst_t  *inst;\r
 } in_info_t;\r
 \r

diff --git a/src/vidtest.c b/src/vidtest.c
index 1a98e88b3d31ed156d0e8cf64120bc415efce32d..94f274933ac393043c20f51b0b4f64e024aeb9a8 100755 (executable)
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -147,20 +147,20 @@ void main(int argc, char *argv[])
 \r
        i=0,k=0,j=0;\r
        startclk = *clockw;\r
-       while(!IN_KeyDown(sc_Escape))\r
+       while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r
                IN_ReadControl(&gvar.player[0], &gvar);\r
                ZC_panPageManual(&gvar.mv, &gvar.player, 0);\r
-//                     if(IN_KeyDown(sc_5)){ modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45); }\r
-//                     if(IN_KeyDown(sc_4)){\r
+//                     if(gvar.in.inst->Keyboard[sc_5)){ modexClearRegion(&gvar.video.page[1],  gvar.video.page[1].sw, 16, 8, 4, 45); }\r
+//                     if(gvar.in.inst->Keyboard[sc_4)){\r
 //                             modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128);\r
 //                             modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42);\r
 //                             modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128);\r
 //                     }\r
                TAIL_PANKEYFUN;\r
-               if(IN_KeyDown(12)) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);\r
-               if(IN_KeyDown(13)) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);\r
-/*====         if(IN_KeyDown(7)){\r
+               if(gvar.in.inst->Keyboard[12]) modexClearRegion(&gvar.video.page[0], (gvar.video.page[0].width/2)-4, (gvar.video.page[0].height/2)-16, 24, 32, 15);\r
+               if(gvar.in.inst->Keyboard[13]) modexClearRegion(&gvar.video.page[1], (gvar.video.page[1].width/2)-4, (gvar.video.page[1].height/2)-16, 24, 32, 15);\r
+/*====         if(gvar.in.inst->Keyboard[7)){\r
                        for(i=0;i<3;i++)\r
                        {\r
                                pal2[i] = rand()%64;\r
@@ -170,9 +170,9 @@ void main(int argc, char *argv[])
                        }\r
 //                     if(i>PAL_SIZE) i=0;\r
                }//9*/\r
-               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p\r
-               if(IN_KeyDown(sc_I)){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i\r
-               if(IN_KeyDown(sc_O)){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o\r
+               if(gvar.in.inst->Keyboard[25]){ modexpdump(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//p\r
+               if(gvar.in.inst->Keyboard[sc_I]){ drawboxesmodex(&gvar.video.page[gvar.video.sp]); IN_UserInput(1, &gvar); }//i\r
+               if(gvar.in.inst->Keyboard[sc_O]){ copyboxesmodex(&gvar.video.page, !gvar.video.sp); IN_UserInput(1, &gvar); }//o\r
                //VL_ShowPage(&gvar.video.page[gvar.video.sp], 0, 0);\r
                ZC_ShowMV(&gvar.mv, 0, 0);\r
        }\r

diff --git a/src/vrstest.c b/src/vrstest.c
index 166a10e0e0ad68ef2eb5fc8c50ab0cd8613fc498..3a59112d03aa66fd26b87740253e241d7f4e5c35 100755 (executable)
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -132,7 +132,7 @@ void main()
                delay(500);\r
        }\r
 \r
-       while(!IN_KeyDown(sc_Escape))\r
+       while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r
                switch(w)\r
                {\r
@@ -145,9 +145,9 @@ void main()
                        break;\r
                }\r
                TAIL_FUNCTIONKEYDRAWJUNKNOMV\r
-               if(IN_KeyDown(sc_F7)){ VL_ShowPage(&gvar.video.page[0], 1, 1);                                                  IN_UserInput(1, &gvar); }\r
-               if(IN_KeyDown(sc_F6)){ VL_ShowPage(&gvar.video.page[0], 1, 0);                                                  IN_UserInput(1, &gvar); }\r
-               if(IN_KeyDown(25)){ modexpdump(&gvar.video.page[0]);  IN_UserInput(1, &gvar); } //p\r
+               if(gvar.in.inst->Keyboard[sc_F7]){ VL_ShowPage(&gvar.video.page[0], 1, 1);                                                      IN_UserInput(1, &gvar); }\r
+               if(gvar.in.inst->Keyboard[sc_F6]){ VL_ShowPage(&gvar.video.page[0], 1, 0);                                                      IN_UserInput(1, &gvar); }\r
+               if(gvar.in.inst->Keyboard[25]){ modexpdump(&gvar.video.page[0]);  IN_UserInput(1, &gvar); } //p\r
        }\r
        VGAmodeX(0, 1, &gvar);\r
        MM_ShowMemory(&gvar);\r

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

diff --git a/vidtest.upx b/vidtest.upx
new file mode 100755 (executable)
index 0000000..e69de29