X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=1bb0d78ca1bea007ce0f9b026c382735a7fc4b76;hb=f888d29c0ceaa48568b15f3269df70e6498c9dbc;hp=f336695a3b8afd1927aa39c3f26a92bb91851b40;hpb=50ed42df635ea472c5abe1a9192729e75b7bfc9b;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index f336695a..1bb0d78c 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,24 +23,115 @@
 	input test
 */
 #include "src/lib/16_in.h"
+#include "src/lib/16_tail.h"
+
+#define INPUTEST_JOYSTICKPADTEST
+//#define INPUTEST_MOUSETEST
 
 void
 main(int argc, char *argv[])
 {
-	player_t player[MaxPlayers];
-	//extern struct inconfig inpu;
-	testkeyin=1;
-	testcontrolnoisy=0;
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
-	//while(!IN_KeyDown(sc_Escape))
-	while(!IN_KeyDown(sc_Escape))
+	static global_game_variables_t gvar;
+#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],
+				#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.spt=4;
+
+	//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])
 	{
-		IN_ReadControl(0,&player);
-		//printf("%u\n", IN_KeyDown(sc_Escape));
-		printf("%u\n", IN_qb(sc_9));
+//0000		shinkutxt(&gvar);
+		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.spt)))
+			{
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
+		break;
+
+		//left movement
+		case 1:
+			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;
+
+		//down movement
+		case 4:
+			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;
+
+		//up movement
+		case 0:
+			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", gvar.in.inst->Keyboard[sc_Escape]);
+		//if(
+		if(gvar.in.inst->Keyboard[88])	//speed
+		{
+			switch(gvar.kurokku.fpscap)
+			{
+				case 0:
+					gvar.kurokku.fpscap=1;
+				break;
+				case 1:
+					gvar.kurokku.fpscap=0;
+				break;
+			}
+			//IN_Ack();
+		}
 	}
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
+		//Shutdown16(&gvar);
 	//printf("%u\n", in.Keyboard[sc_Escape]);
-	printf("%u\n", testkeyin);
+	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);
 }