p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / src / 0.c

diff --git a/src/0.c b/src/0.c
index 28d5ff052871dd9d7c2ff40a7e80c9abfd985809..051bb332fe8be6ff3e01a5e3d1f84e7a54658b20 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -101,8 +101,8 @@ int main(int argc,char **argv)
        vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));\r
        if (vrl_lineoffs == NULL) return 1;\r
 \r
-       IN_Startup();\r
-       IN_Default(0,&gvar.player[0],ctrl_Keyboard1);\r
+       IN_Startup(&gvar);\r
+       IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);\r
        EN_initPlayer(&gvar.player[0], &gvar.video);\r
 \r
        /* setup camera and screen~ */\r
@@ -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]);\r
-                       if(IN_KeyDown(68)){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1); } //f10\r
+                       IN_ReadControl(&gvar.player[0], &gvar);\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); else zerostoppause=0;\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
@@ -213,7 +213,7 @@ draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header
                }\r
        }\r
 \r
-       IN_UserInput(1);\r
+       IN_UserInput(1, &gvar);\r
 \r
 //===========================================================================//\r
 \r
@@ -301,7 +301,7 @@ if(!noanim) {
                }\r
        }\r
 }\r
-       IN_Shutdown();\r
+       IN_Shutdown(&gvar);\r
        VGAmodeX(0, 1, &gvar);\r
        free(vrl_lineoffs);\r
        buffer = NULL;\r