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

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index f5a9e8526b1bb685fb16b4201bcb6b3ab629a5c8..199dc90b2c152d9f5e94e7e52da2bc07c04bf7c5 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -30,10 +30,11 @@ main(int argc, char *argv[])
        global_game_variables_t gvar;\r
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
-       testkeyin=0;\r
-       testcontrolnoisy=1;\r
+       testkeyin=1;\r
+       testcontrolnoisy=0;\r
+       testctrltype=0;\r
        IN_Startup();\r
-       IN_Default(0,&player,ctrl_Joystick);\r
+       IN_Default(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r
        player[0].q=1;\r
        player[0].d=2;\r
@@ -106,4 +107,5 @@ main(int argc, char *argv[])
        printf("version %s\n", VERSION);\r
        printf("testkeyin=%u\n", testkeyin);\r
        printf("testcontrolnoisy=%u\n", testcontrolnoisy);\r
+       printf("testctrltype=%u\n", testctrltype);\r
 }\r