inputest reverted

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 03f7a331f48d68f19bfb0103adcd71b90fa1f944..62e2d8177b55a9fd0173487079b9f20bfc610eaa 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\r
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -33,7 +33,8 @@ main(int argc, char *argv[])
        testkeyin=0;\r
        testcontrolnoisy=1;\r
        IN_Startup();\r
-       IN_Default(0,&player,ctrl_Joystick);\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
@@ -42,7 +43,7 @@ main(int argc, char *argv[])
        start_timer(&gvar);\r
        while(!IN_KeyDown(sc_Escape))\r
        {\r
-               shinkutxt(&gvar);\r
+               //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