__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 1f88a3ccbafb60b665e1413093f539e577a958ae..56370b7453098636e7485ea9796fd96e01e397f8 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -29,61 +29,62 @@ void
 main(int argc, char *argv[])\r
 {\r
        static global_game_variables_t gvar;\r
-       player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
        dbg_testkeyin=0;\r
        dbg_testcontrolnoisy=1;\r
        start_timer(&gvar);\r
        //Startup16(&gvar);\r
-       IN_Startup();\r
-       //IN_Default(0,&player,ctrl_Joystick1);\r
-       //IN_SetControlType(0,&player,ctrl_Joystick1);\r
-       IN_Default(0,&player,ctrl_Keyboard1);\r
-       IN_SetControlType(0,&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
-       player[0].enti.q=1;\r
-       player[0].enti.d=2;\r
-       player[0].enti.speed=4;\r
+       gvar.player[0].enti.q=1;\r
+       gvar.player[0].enti.d=2;\r
+       gvar.player[0].enti.speed=4;\r
 \r
 //0000 nibbletest();\r
 //0000 booleantest();\r
-       //printf("dbg_testkeyin=%u      dbg_testcontrolnoisy=%u dbg_noplayerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_noplayerinpu);\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
        {\r
 //0000         shinkutxt(&gvar);\r
-               IN_ReadControl(0, &player);\r
-               switch(player[0].enti.d)\r
+               IN_ReadControl(&gvar.player[0], &gvar);\r
+               switch(gvar.player[0].enti.d)\r
                {\r
                //right movement\r
                case 3:\r
-                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
                        {\r
-                               player[0].enti.q++;\r
-                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
+                               gvar.player[0].enti.q++;\r
+                       } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
                break;\r
 \r
                //left movement\r
                case 1:\r
-                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
                        {\r
-                               player[0].enti.q++;\r
-                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
+                               gvar.player[0].enti.q++;\r
+                       } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
                break;\r
 \r
                //down movement\r
                case 4:\r
-                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
                        {\r
-                               player[0].enti.q++;\r
-                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
+                               gvar.player[0].enti.q++;\r
+                       } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
                break;\r
 \r
                //up movement\r
                case 0:\r
-                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
                        {\r
-                               player[0].enti.q++;\r
-                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
+                               gvar.player[0].enti.q++;\r
+                       } 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
@@ -103,7 +104,7 @@ 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