X-Git-Url: http://git.osdn.net/view?p=proj16%2F16.git;a=blobdiff_plain;f=src%2Finputest.c;h=a27c2dd5ab5182508eab1ae504e3daa2a4b0394d;hp=30cb8598ac41ce1b5cc9f3f6f1d6f0e83a4bf35d;hb=9540760f9429bfe71894c801e85cec95e3887f8c;hpb=faab239b16b39312b26f6c4c1af85f1258aa4445

diff --git a/src/inputest.c b/src/inputest.c
index 30cb8598..a27c2dd5 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2021 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -25,71 +25,90 @@
 #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;
-	player_t player[MaxPlayers];
-	//extern struct inconfig inpu;
-	dbg_testkeyin=0;
+#ifdef __DEBUG_InputMgr__
+	dbg_testkeyin=1;
 	dbg_testcontrolnoisy=1;
+	dbg_joymousedelta=1;
+#endif
 	start_timer(&gvar);
 	//Startup16(&gvar);
-	IN_Startup();
-	//IN_Default(0,&player,ctrl_Joystick1);
-	//IN_SetControlType(0,&player,ctrl_Joystick1);
-	IN_Default(0,&player,ctrl_Keyboard1);
-	IN_SetControlType(0,&player,ctrl_Keyboard1);
+	IN_Startup(&gvar);
+	IN_Default(0,&gvar.player[0],
+				#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],
+				#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
+												);
 
-	player[0].enti.q=1;
-	player[0].enti.d=2;
-	player[0].enti.speed=4;
+	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_noplayerinpu=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy, dbg_noplayerinpu);
-	while(!IN_KeyDown(sc_Escape))
+	printf("dbg_testkeyin=%u	dbg_testcontrolnoisy=%u\nloop if this is not responsive then please KILL or reset machine sorry!!\n", dbg_testkeyin, dbg_testcontrolnoisy);
+	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
 //0000		shinkutxt(&gvar);
-		IN_ReadControl(0, &player);
-		switch(player[0].enti.d)
+		IN_ReadControl(&gvar.player[0], &gvar);
+		switch(gvar.player[0].enti.d)
 		{
 		//right movement
 		case 3:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//left movement
 		case 1:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//down movement
 		case 4:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//up movement
 		case 0:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.spt)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 	}
-		//printf("%u\n", IN_KeyDown(sc_Escape));
+		//printf("%u\n", gvar.in.inst->Keyboard[sc_Escape]);
 		//if(
-		IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
-		if(IN_KeyDown(88))	//speed
+		if(gvar.in.inst->Keyboard[88])	//speed
 		{
 			switch(gvar.kurokku.fpscap)
 			{
@@ -103,11 +122,16 @@ main(int argc, char *argv[])
 			//IN_Ack();
 		}
 	}
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
 		//Shutdown16(&gvar);
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");
 	printf("version %s\n", VERSION);
+#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);
 }