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

[16.git] / src / vidtest.c

diff --git a/src/vidtest.c b/src/vidtest.c
index 1a98e88b3d31ed156d0e8cf64120bc415efce32d..8995f1d857b224a49a5f19aa357a309e0fa62997 100755 (executable)
--- a/src/vidtest.c
+++ b/src/vidtest.c
@@ -107,7 +107,7 @@ void main(int argc, char *argv[])
        modexPalBlack();\r
 \r
        /* load our palette */\r
-       VL_LoadPalFile("data/16.pal", &gvar.video.palette);\r
+       VL_LoadPalFile("data/16.pal", &gvar.video.palette, &gvar);\r
        bmp1.offset=(paloffset/3);\r
        VL_palette(&bmp1, &gvar.video.palette, &paloffset, 0, 0, &gvar);\r
 \r
@@ -121,7 +121,7 @@ void main(int argc, char *argv[])
        //modexPalOverscan(44+1);\r
 \r
        /* set up the page, but with 16 pixels on all borders in offscreen mem */\r
-       modexHiganbanaPageSetup(&gvar.video);\r
+       modexHiganbanaPageSetup(&gvar);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
        /* fill the page with one color, but with a black border */\r
@@ -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