X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=83619cb6c605fbce229c376198725a4fc4c5b158;hb=fd22359b3cf8abccf814365b79906b15a98c8e4e;hp=d4a3d44c50f6150bda75fbf381b1a3a2c0773787;hpb=53d918625e7c5e1e9da827755449d6a901e6d302;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
old mode 100644
new mode 100755
index d4a3d44c..83619cb6
--- 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,37 +23,117 @@
 	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];
-	inconfig in;
-	//word i=0;
+{
+	static global_game_variables_t gvar;
+#ifdef __DEBUG_InputMgr__
+	dbg_testkeyin=1;
+	dbg_testcontrolnoisy=0;
+	dbg_joymousedelta=1;
+#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;
+
+//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])
+	{
+//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;
 
-	in.KbdDefs[0].button0 = 0x1d;
-	in.KbdDefs[0].button1 = 0x38;
-	//in.KbdDefs[0].upleft = 0x47;
-	in.KbdDefs[0].up = 0x48;
-	//in.KbdDefs[0].upright = 0x49;
-	in.KbdDefs[0].left = 0x4b;
-	in.KbdDefs[0].right = 0x4d;
-	//in.KbdDefs[0].downleft = 0x4f;
-	in.KbdDefs[0].down = 0x50;
-	//in.KbdDefs[0].downright = 0x51;
+		//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;
 
-	if(IN_Startup(&in))
-	{
-		IN_Default(0,&player,ctrl_Joystick, &in);
-		while(!in.Keyboard[sc_Escape])
-		{
-			IN_ReadControl(0,&player, &in);
-			//printf("%u\n", in.Keyboard[sc_Escape]);
-			//printf("i=%u\n", i);
-			printf("");
-			//i++;
-		}
-		IN_Shutdown(&in);
-	}
+		//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(&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);
 }