X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=aea00f646e6a730b720f5b4fe6a760ae781d4c48;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=d802ab522b5aa7e004baa88fd5d917c6dc9f8dce;hpb=8c5ce6d6e768ba3dfac7f4e2e95d68152ab42aaa;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index d802ab52..aea00f64 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -25,30 +25,48 @@
 #include "src/lib/16_in.h"
 #include "src/lib/16_tail.h"
 
+#define INPUTEST_JOYSTICKPADTEST
+//#define INPUTEST_MOUSETEST
+
 void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
 #ifdef __DEBUG_InputMgr__
-	dbg_testkeyin=1;
-	dbg_testcontrolnoisy=0;
+	dbg_testkeyin=0;
+	dbg_testcontrolnoisy=1;
+	dbg_joymousedelta=0;
 #endif
 	start_timer(&gvar);
 	//Startup16(&gvar);
 	IN_Startup(&gvar);
 	IN_Default(0,&gvar.player[0],
-ctrl_Keyboard1, &gvar);
-//ctrl_Joystick1);
+				#if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
+								ctrl_Keyboard1
+				#endif
+				#if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
+								ctrl_Joystick1
+				#endif
+				#if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)
+								ctrl_Mouse
+				#endif
+												, &gvar);
 	IN_SetControlType(&gvar.player[0],
-ctrl_Keyboard1);
-//ctrl_Joystick1);
+				#if !defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
+								ctrl_Keyboard1
+				#endif
+				#if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
+								ctrl_Joystick1
+				#endif
+				#if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)
+								ctrl_Mouse
+				#endif
+												);
 
 	gvar.player[0].enti.q=1;
 	gvar.player[0].enti.d=2;
 	gvar.player[0].enti.spt=4;
 
-//0000	nibbletest();
-//0000	booleantest();
 	//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);
 	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
@@ -112,5 +130,8 @@ ctrl_Keyboard1);
 #ifdef __DEBUG_InputMgr__
 	printf("testkeyin=%u\n", dbg_testkeyin);
 	printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
+	printf("dbg_joymousedelta=%u\n", dbg_joymousedelta);
 #endif
+	printf("JoysPresent={%d,%d}\n", gvar.in.JoysPresent[0], gvar.in.JoysPresent[1]);
+	printf("MousePresent=%d\n", gvar.in.MousePresent);
 }