X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=2b2d564b9e411b7154e8c8a24909e1c5015dab10;hb=26536b16d4825df06a4e73380985afb3a0bfb7e4;hp=1f88a3ccbafb60b665e1413093f539e577a958ae;hpb=fa252ebd82649e4f3bab4a53228828766713ad6c;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 1f88a3cc..2b2d564b 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -29,61 +29,62 @@ void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
 	dbg_testkeyin=0;
 	dbg_testcontrolnoisy=1;
 	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);
+	IN_Default(0,&gvar.player[0],
+ctrl_Keyboard1);
+//ctrl_Joystick1);
+	IN_SetControlType(&gvar.player[0],
+ctrl_Keyboard1);
+//ctrl_Joystick1);
 
-	player[0].enti.q=1;
-	player[0].enti.d=2;
-	player[0].enti.speed=4;
+	gvar.player[0].enti.q=1;
+	gvar.player[0].enti.d=2;
+	gvar.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);
+	//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))
 	{
 //0000		shinkutxt(&gvar);
-		IN_ReadControl(0, &player);
-		switch(player[0].enti.d)
+		IN_ReadControl(&gvar.player[0]);
+		switch(gvar.player[0].enti.d)
 		{
 		//right movement
 		case 3:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//left movement
 		case 1:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//down movement
 		case 4:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				gvar.player[0].enti.q++;
+			} else { gvar.player[0].enti.q = 1; gvar.player[0].enti.d = 2; }
 		break;
 
 		//up movement
 		case 0:
-			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
+			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
 			{
-				player[0].enti.q++;
-			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
+				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));