==== MAJOR CHANGES ARE BEING MADE!! WWWW ====

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index c4b59fd9a53de400a22caf770144b3ece674e058..07b3930696bd68a310dd005af2a543d63e3bb79c 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -28,74 +28,68 @@
 void\r
 main(int argc, char *argv[])\r
 {\r
-       global_game_variables_t gvar;\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
-       dbg_noplayerinpu=0;\r
-       if(!dbg_noplayerinpu)\r
-       {\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
-       }\r
-       player[0].q=1;\r
-       player[0].d=2;\r
-       player[0].persist_aniframe=0;\r
-       player[0].speed=4;\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
 \r
-       nibbletest();\r
-       if(dbg_noplayerinpu) getch();\r
-       booleantest();\r
-       //printf("nibble size is %u\n", sizeof(nibble));\r
-       if(!dbg_noplayerinpu){\r
+       player[0].enti.q=1;\r
+       player[0].enti.d=2;\r
+       player[0].enti.persist_aniframe=0;\r
+       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
        while(!IN_KeyDown(sc_Escape))\r
        {\r
-               shinkutxt(&gvar);\r
+//0000         shinkutxt(&gvar);\r
                IN_ReadControl(0, &player);\r
-               #define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;\r
-               switch(player[0].d)\r
+               #define INC_PER_FRAME if(player[0].enti.q&1) player[0].enti.persist_aniframe++; if(player[0].enti.persist_aniframe>4) player[0].enti.persist_aniframe = 1;\r
+               switch(player[0].enti.d)\r
                {\r
                //right movement\r
                case 3:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //left movement\r
                case 1:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //down movement\r
                case 4:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
 \r
                //up movement\r
                case 0:\r
-                       if(player[0].q<=(TILEWH/(player[0].speed)))\r
+                       if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))\r
                        {\r
                                INC_PER_FRAME;\r
-                               player[0].q++;\r
-                       } else { player[0].q = 1; player[0].d = 2; }\r
+                               player[0].enti.q++;\r
+                       } else { player[0].enti.q = 1; player[0].enti.d = 2; }\r
                break;\r
        }\r
                //printf("%u\n", IN_KeyDown(sc_Escape));\r
@@ -117,11 +111,9 @@ main(int argc, char *argv[])
        }\r
        IN_Shutdown();\r
                //Shutdown16(&gvar);\r
-       }\r
        //printf("%u\n", in.Keyboard[sc_Escape]);\r
        printf("inputest.exe ");\r
        printf("version %s\n", VERSION);\r
        printf("testkeyin=%u\n", dbg_testkeyin);\r
        printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);\r
-       printf("dbg_noplayerinpu=%u\n", dbg_noplayerinpu);\r
 }\r