tired i will work on joy stick stuff later

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index d802ab522b5aa7e004baa88fd5d917c6dc9f8dce..83619cb6c605fbce229c376198725a4fc4c5b158 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -25,6 +25,9 @@
 #include "src/lib/16_in.h"\r
 #include "src/lib/16_tail.h"\r
 \r
+#define INPUTEST_JOYSTICKPADTEST\r
+//#define INPUTEST_MOUSETEST\r
+\r
 void\r
 main(int argc, char *argv[])\r
 {\r
@@ -32,16 +35,33 @@ main(int argc, char *argv[])
 #ifdef __DEBUG_InputMgr__\r
        dbg_testkeyin=1;\r
        dbg_testcontrolnoisy=0;\r
+       dbg_joymousedelta=1;\r
 #endif\r
        start_timer(&gvar);\r
        //Startup16(&gvar);\r
        IN_Startup(&gvar);\r
        IN_Default(0,&gvar.player[0],\r
-ctrl_Keyboard1, &gvar);\r
-//ctrl_Joystick1);\r
+                               #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Keyboard1\r
+                               #endif\r
+                               #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Joystick1\r
+                               #endif\r
+                               #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Mouse\r
+                               #endif\r
+                                                                                               , &gvar);\r
        IN_SetControlType(&gvar.player[0],\r
-ctrl_Keyboard1);\r
-//ctrl_Joystick1);\r
+                               #if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Keyboard1\r
+                               #endif\r
+                               #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Joystick1\r
+                               #endif\r
+                               #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
+                                                               ctrl_Mouse\r
+                               #endif\r
+                                                                                               );\r
 \r
        gvar.player[0].enti.q=1;\r
        gvar.player[0].enti.d=2;\r
@@ -112,5 +132,8 @@ ctrl_Keyboard1);
 #ifdef __DEBUG_InputMgr__\r
        printf("testkeyin=%u\n", dbg_testkeyin);\r
        printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);\r
+       printf("dbg_joymousedelta=%u\n", dbg_joymousedelta);\r
 #endif\r
+       printf("JoysPresent={%d,%d}\n", gvar.in.JoysPresent[0], gvar.in.JoysPresent[1]);\r
+       printf("MousePresent=%d\n", gvar.in.MousePresent);\r
 }\r