X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=c4b59fd9a53de400a22caf770144b3ece674e058;hb=8e974b9ed72a1521714ea3cf96a9b87c68db8025;hp=03f7a331f48d68f19bfb0103adcd71b90fa1f944;hpb=b944e5a4e57c1a1ba44dff4ffafdee4edd5b5d99;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 03f7a331..c4b59fd9 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,6 +23,7 @@
 	input test
 */
 #include "src/lib/16_in.h"
+#include "src/lib/16_tail.h"
 
 void
 main(int argc, char *argv[])
@@ -30,20 +31,34 @@ main(int argc, char *argv[])
 	global_game_variables_t gvar;
 	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
-	testkeyin=0;
-	testcontrolnoisy=1;
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
-	//while(!IN_KeyDown(sc_Escape))
+	dbg_testkeyin=0;
+	dbg_testcontrolnoisy=1;
+	dbg_noplayerinpu=0;
+	if(!dbg_noplayerinpu)
+	{
+		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);
+	}
 	player[0].q=1;
 	player[0].d=2;
 	player[0].persist_aniframe=0;
 	player[0].speed=4;
-	start_timer(&gvar);
+
+	nibbletest();
+	if(dbg_noplayerinpu) getch();
+	booleantest();
+	//printf("nibble size is %u\n", sizeof(nibble));
+	if(!dbg_noplayerinpu){
+	//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))
 	{
 		shinkutxt(&gvar);
-		IN_ReadControl(0,&player);
+		IN_ReadControl(0, &player);
 		#define INC_PER_FRAME if(player[0].q&1) player[0].persist_aniframe++; if(player[0].persist_aniframe>4) player[0].persist_aniframe = 1;
 		switch(player[0].d)
 		{
@@ -101,9 +116,12 @@ main(int argc, char *argv[])
 		}
 	}
 	IN_Shutdown();
+		//Shutdown16(&gvar);
+	}
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");
 	printf("version %s\n", VERSION);
-	printf("testkeyin=%u\n", testkeyin);
-	printf("testcontrolnoisy=%u\n", testcontrolnoisy);
+	printf("testkeyin=%u\n", dbg_testkeyin);
+	printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
+	printf("dbg_noplayerinpu=%u\n", dbg_noplayerinpu);
 }