X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=efba7464bbbaa1024716730dc62169d7ff96bb7c;hb=eda37da84ccb4fc381507f04832d0358799ed67c;hp=1ba8b22729d67bde156df17820bab14caf524da9;hpb=5c33a30248aff1745430cd0e926c343242e4c889;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 1ba8b227..efba7464 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -25,37 +25,60 @@
 #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;
-	//extern struct inconfig inpu;
+#ifdef __DEBUG_InputMgr__
 	dbg_testkeyin=0;
 	dbg_testcontrolnoisy=1;
+	dbg_joymousedelta=0;
+#endif
 	start_timer(&gvar);
 	//Startup16(&gvar);
-	IN_Startup();
-	//IN_Default(0,&gvar.player,ctrl_Joystick1);
-	//IN_SetControlType(0,&gvar.player,ctrl_Joystick1);
-	IN_Default(0,&gvar.player,ctrl_Keyboard1);
-	IN_SetControlType(0,&gvar.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
+												);
 
 	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();
 	//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(!IN_KeyDown(sc_Escape))
+	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
 //0000		shinkutxt(&gvar);
-		IN_ReadControl(0, &gvar.player);
+		IN_ReadControl(&gvar.player[0], &gvar);
 		switch(gvar.player[0].enti.d)
 		{
 		//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; }
@@ -63,7 +86,7 @@ main(int argc, char *argv[])
 
 		//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; }
@@ -71,7 +94,7 @@ main(int argc, char *argv[])
 
 		//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; }
@@ -79,16 +102,15 @@ main(int argc, char *argv[])
 
 		//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; }
 		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)
 			{
@@ -102,11 +124,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);
 }