branch is in the master swap branch code added to swap the files out ^^

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 44195363d18a91232ebb1e41742158bd04dd4e4b..3722c1754cbd8b170e6bd9bcbd778fe13b035230 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -31,10 +31,10 @@ main(int argc, char *argv[])
        player_t player[MaxPlayers];\r
        //extern struct inconfig inpu;\r
        testkeyin=0;\r
-       testcontrolnoisy=0;\r
-       testctrltype=1;\r
+       testcontrolnoisy=1;\r
        IN_Startup();\r
        IN_Default(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
@@ -107,5 +107,4 @@ 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