X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=8016e495088e723664d46c095a599885208ae3f3;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=8d76a7fca3e82ffeb64e63b5b2a222bf2a5b0053;hpb=5991a0522a36b2a73bc223c50113965179a53b7a;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 8d76a7fc..8016e495 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-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -25,6 +25,9 @@
 #include "src/lib/16_in.h"
 #include "src/lib/16_tail.h"
 
+#define INPUTEST_JOYSTICKPADTEST
+//#define INPUTEST_MOUSETEST
+
 void
 main(int argc, char *argv[])
 {
@@ -32,20 +35,37 @@ main(int argc, char *argv[])
 #ifdef __DEBUG_InputMgr__
 	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.speed=4;
+	gvar.player[0].enti.spt=4;
 
 //0000	nibbletest();
 //0000	booleantest();
@@ -58,7 +78,7 @@ ctrl_Keyboard1);
 		{
 		//right movement
 		case 3:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
 				gvar.player[0].enti.q++;
 			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
@@ -66,7 +86,7 @@ ctrl_Keyboard1);
 
 		//left movement
 		case 1:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
 				gvar.player[0].enti.q++;
 			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
@@ -74,7 +94,7 @@ ctrl_Keyboard1);
 
 		//down movement
 		case 4:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
 				gvar.player[0].enti.q++;
 			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
@@ -82,7 +102,7 @@ ctrl_Keyboard1);
 
 		//up movement
 		case 0:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
 				gvar.player[0].enti.q++;
 			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
@@ -112,5 +132,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);
 }