removed some junk

[16.git] / src / inputest.c

diff --git a/src/inputest.c b/src/inputest.c
index 4df28afe643acd0f78ab03d847ca7313440f4e3b..1bb0d78ca1bea007ce0f9b026c382735a7fc4b76 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
  *\r
  * This file is part of Project 16.\r
  *\r
@@ -25,30 +25,48 @@
 #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
        static global_game_variables_t gvar;\r
 #ifdef __DEBUG_InputMgr__\r
-       dbg_testkeyin=1;\r
-       dbg_testcontrolnoisy=0;\r
+       dbg_testkeyin=0;\r
+       dbg_testcontrolnoisy=1;\r
+       dbg_joymousedelta=0;\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
-       gvar.player[0].enti.speed=4;\r
+       gvar.player[0].enti.spt=4;\r
 \r
-//0000 nibbletest();\r
-//0000 booleantest();\r
        //printf("dbg_testkeyin=%u      dbg_testcontrolnoisy=%u dbg_nogvar.playerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_nogvar.playerinpu);\r
        while(!gvar.in.inst->Keyboard[sc_Escape])\r
        {\r
@@ -58,7 +76,7 @@ ctrl_Keyboard1);
                {\r
                //right movement\r
                case 3:\r
-                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))\r
                        {\r
                                gvar.player[0].enti.q++;\r
                        } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
@@ -66,7 +84,7 @@ ctrl_Keyboard1);
 \r
                //left movement\r
                case 1:\r
-                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))\r
                        {\r
                                gvar.player[0].enti.q++;\r
                        } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
@@ -74,7 +92,7 @@ ctrl_Keyboard1);
 \r
                //down movement\r
                case 4:\r
-                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))\r
                        {\r
                                gvar.player[0].enti.q++;\r
                        } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
@@ -82,7 +100,7 @@ ctrl_Keyboard1);
 \r
                //up movement\r
                case 0:\r
-                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))\r
+                       if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))\r
                        {\r
                                gvar.player[0].enti.q++;\r
                        } else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }\r
@@ -112,5 +130,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