X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=56370b7453098636e7485ea9796fd96e01e397f8;hb=af2715fef8681d909afe82f7baaf5e13baabb76f;hp=07b3930696bd68a310dd005af2a543d63e3bb79c;hpb=f238018d45d05a57a7ba93381f14f9d1b108c745;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 07b39306..56370b74 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.
  *
@@ -29,67 +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_Startup(&gvar);
+	IN_Default(0,&gvar.player[0],
+ctrl_Keyboard1, &gvar);
+//ctrl_Joystick1);
+	IN_SetControlType(&gvar.player[0],
+ctrl_Keyboard1);
+//ctrl_Joystick1);
 
-	player[0].enti.q=1;
-	player[0].enti.d=2;
-	player[0].enti.persist_aniframe=0;
-	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);
-		#define INC_PER_FRAME if(player[0].enti.q&1) player[0].enti.persist_aniframe++; if(player[0].enti.persist_aniframe>4) player[0].enti.persist_aniframe = 1;
-		switch(player[0].enti.d)
+		IN_ReadControl(&gvar.player[0], &gvar);
+		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)))
 			{
-				INC_PER_FRAME;
-				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)))
 			{
-				INC_PER_FRAME;
-				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)))
 			{
-				INC_PER_FRAME;
-				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)))
 			{
-				INC_PER_FRAME;
-				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));
@@ -109,7 +104,7 @@ main(int argc, char *argv[])
 			//IN_Ack();
 		}
 	}
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
 		//Shutdown16(&gvar);
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");