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

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 1ba8b22729d67bde156df17820bab14caf524da9..8d76a7fca3e82ffeb64e63b5b2a222bf2a5b0053 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -29,16 +29,19 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       //extern struct inconfig inpu;\r
+#ifdef __DEBUG_InputMgr__\r
        dbg_testkeyin=0;\r
        dbg_testcontrolnoisy=1;\r
+#endif\r
        start_timer(&gvar);\r
        //Startup16(&gvar);\r
-       IN_Startup();\r
-       //IN_Default(0,&gvar.player,ctrl_Joystick1);\r
-       //IN_SetControlType(0,&gvar.player,ctrl_Joystick1);\r
-       IN_Default(0,&gvar.player,ctrl_Keyboard1);\r
-       IN_SetControlType(0,&gvar.player,ctrl_Keyboard1);\r
+       IN_Startup(&gvar);\r
+       IN_Default(0,&gvar.player[0],\r
+ctrl_Keyboard1, &gvar);\r
+//ctrl_Joystick1);\r
+       IN_SetControlType(&gvar.player[0],\r
+ctrl_Keyboard1);\r
+//ctrl_Joystick1);\r
 \r
        gvar.player[0].enti.q=1;\r
        gvar.player[0].enti.d=2;\r
@@ -47,10 +50,10 @@ main(int argc, char *argv[])
 //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(0, &gvar.player);\r
+               IN_ReadControl(&gvar.player[0], &gvar);\r
                switch(gvar.player[0].enti.d)\r
                {\r
                //right movement\r
@@ -85,10 +88,9 @@ main(int argc, char *argv[])
                        } 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
@@ -102,11 +104,13 @@ main(int argc, char *argv[])
                        //IN_Ack();\r
                }\r
        }\r
-       IN_Shutdown();\r
+       IN_Shutdown(&gvar);\r
                //Shutdown16(&gvar);\r
        //printf("%u\n", in.Keyboard[sc_Escape]);\r
        printf("inputest.exe ");\r
        printf("version %s\n", VERSION);\r
+#ifdef __DEBUG_InputMgr__\r
        printf("testkeyin=%u\n", dbg_testkeyin);\r
        printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);\r
+#endif\r
 }\r