Merge branch 'master' of github.com:sparky4/16

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 7666b2e06f3c757603298d3c41910eec8de4fc74..a573d54a8e769cf0d86fde5781dd2506a723f3a9 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -30,11 +30,11 @@ main(int argc, char *argv[])
        global_game_variables_t gvar;\r
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
-       testkeyin=1;\r
-       testcontrolnoisy=1;\r
+       dbg_testkeyin=1;\r
+       dbg_testcontrolnoisy=1;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick1);\r
-       //IN_SetControlType(0,&player,ctrl_Joystick1);\r
+       IN_SetControlType(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r
        player[0].q=1;\r
        player[0].d=2;\r
@@ -105,6 +105,6 @@ main(int argc, char *argv[])
        //printf("%u\n", in.Keyboard[sc_Escape]);\r
        printf("inputest.exe ");\r
        printf("version %s\n", VERSION);\r
-       printf("testkeyin=%u\n", testkeyin);\r
-       printf("testcontrolnoisy=%u\n", testcontrolnoisy);\r
+       printf("testkeyin=%u\n", dbg_testkeyin);\r
+       printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);\r
 }\r