X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=d802ab522b5aa7e004baa88fd5d917c6dc9f8dce;hb=033a884c3a161367f6820dbcc959111403ecd497;hp=1ba8b22729d67bde156df17820bab14caf524da9;hpb=d182bbe56ee5292986d3ae5ea273b9ff4142fd7e;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 1ba8b227..d802ab52 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -29,33 +29,36 @@ void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	//extern struct inconfig inpu;
-	dbg_testkeyin=0;
-	dbg_testcontrolnoisy=1;
+#ifdef __DEBUG_InputMgr__
+	dbg_testkeyin=1;
+	dbg_testcontrolnoisy=0;
+#endif
 	start_timer(&gvar);
 	//Startup16(&gvar);
-	IN_Startup();
-	//IN_Default(0,&gvar.player,ctrl_Joystick1);
-	//IN_SetControlType(0,&gvar.player,ctrl_Joystick1);
-	IN_Default(0,&gvar.player,ctrl_Keyboard1);
-	IN_SetControlType(0,&gvar.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);
 
 	gvar.player[0].enti.q=1;
 	gvar.player[0].enti.d=2;
-	gvar.player[0].enti.speed=4;
+	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(!IN_KeyDown(sc_Escape))
+	while(!gvar.in.inst->Keyboard[sc_Escape])
 	{
 //0000		shinkutxt(&gvar);
-		IN_ReadControl(0, &gvar.player);
+		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.speed)))
+			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; }
@@ -63,7 +66,7 @@ main(int argc, char *argv[])
 
 		//left movement
 		case 1:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			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; }
@@ -71,7 +74,7 @@ main(int argc, char *argv[])
 
 		//down movement
 		case 4:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			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; }
@@ -79,16 +82,15 @@ main(int argc, char *argv[])
 
 		//up movement
 		case 0:
-			if(gvar.player[0].enti.q<=(TILEWH/(gvar.player[0].enti.speed)))
+			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", IN_KeyDown(sc_Escape));
+		//printf("%u\n", gvar.in.inst->Keyboard[sc_Escape]);
 		//if(
-		IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
-		if(IN_KeyDown(88))	//speed
+		if(gvar.in.inst->Keyboard[88])	//speed
 		{
 			switch(gvar.kurokku.fpscap)
 			{
@@ -102,11 +104,13 @@ main(int argc, char *argv[])
 			//IN_Ack();
 		}
 	}
-	IN_Shutdown();
+	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);
+#endif
 }