X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=1f88a3ccbafb60b665e1413093f539e577a958ae;hb=9f7ffee2115e5b995c5470117e426d2c89b58979;hp=52d36283cc8440eff8425d19c7c273518e26963b;hpb=2e3fb239b58cf341ceb5b4e7b39b6542f5581cae;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 52d36283..1f88a3cc 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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -28,70 +28,62 @@
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
+	static global_game_variables_t gvar;
 	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
 	dbg_testkeyin=0;
 	dbg_testcontrolnoisy=1;
-	dbg_noplayerinpu=1;
-	if(!dbg_noplayerinpu)
-	{
-		IN_Startup();
-		IN_Default(0,&player,ctrl_Joystick1);
-		IN_SetControlType(/*0,*/&player,ctrl_Joystick1);
-	}
-	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);
+	//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].enti.q=1;
+	player[0].enti.d=2;
+	player[0].enti.speed=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))
 	{
-		shinkutxt(&gvar);
-		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)
+//0000		shinkutxt(&gvar);
+		IN_ReadControl(0, &player);
+		switch(player[0].enti.d)
 		{
 		//right movement
 		case 3:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//left movement
 		case 1:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//down movement
 		case 4:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//up movement
 		case 0:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 	}
 		//printf("%u\n", IN_KeyDown(sc_Escape));
@@ -111,11 +103,11 @@ main(int argc, char *argv[])
 			//IN_Ack();
 		}
 	}
-	IN_Shutdown(); }
+	IN_Shutdown();
+		//Shutdown16(&gvar);
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");
 	printf("version %s\n", VERSION);
 	printf("testkeyin=%u\n", dbg_testkeyin);
 	printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
-	printf("dbg_noplayerinpu=%u\n", dbg_noplayerinpu);
 }