X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finntest.c;h=5655e5aea7735445fdba921477dca8e9d84418fb;hb=6c49efb1f9ef6e2e326ceb08e1ac0e41fd18ee18;hp=1ba8b22729d67bde156df17820bab14caf524da9;hpb=c421d6353c601dc59f7d9e42883f0711c6a89805;p=16.git

diff --git a/src/inntest.c b/src/inntest.c
index 1ba8b227..5655e5ae 100755
--- a/src/inntest.c
+++ b/src/inntest.c
@@ -22,36 +22,41 @@
 /*
 	input test
 */
-#include "src/lib/16_in.h"
-#include "src/lib/16_tail.h"
+#include "src/lib/16_in_1.h"
+
+void probe_dos(){}
+void cpu_probe(){}
+//int probe_vga(){ return 0; }
+//void VGAmodeX(){}
 
 void
 main(int argc, char *argv[])
 {
 	static global_game_variables_t gvar;
-	//extern struct inconfig inpu;
-	dbg_testkeyin=0;
-	dbg_testcontrolnoisy=1;
-	start_timer(&gvar);
+	dbg_nointest=0;
+	dbg_testkeyin=1;
+	dbg_testcontrolnoisy=0;
+	start_timer(&gvar);	printf(".");
 	//Startup16(&gvar);
-	IN_Startup();
+	IN_Startup(&gvar);	printf(".");
 	//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_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar);	printf(".");
+	IN_SetControlType(&gvar.player[0],ctrl_Keyboard1);	printf(".");
 
 	gvar.player[0].enti.q=1;
 	gvar.player[0].enti.d=2;
 	gvar.player[0].enti.speed=4;
 
-//0000	nibbletest();
-//0000	booleantest();
+//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))
+	printf("\nloop\n");
+	while(!IN_KeyDown(sc_Escape, &gvar))
 	{
 //0000		shinkutxt(&gvar);
-		IN_ReadControl(0, &gvar.player);
-		switch(gvar.player[0].enti.d)
+		IN_ReadControl(&gvar.player[0], &gvar);
+/*		switch(gvar.player[0].enti.d)
 		{
 		//right movement
 		case 3:
@@ -84,11 +89,12 @@ main(int argc, char *argv[])
 				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));
-		//if(
-		IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
-		if(IN_KeyDown(88))	//speed
+	}*/
+		//printf("%u\n", IN_KeyDown(sc_Escape, &gvar));
+		//if(gvar.in.Keyboard[sc_Escape])
+			printf("gvar.in.Keyboard[sc_Escape]=%u\n", gvar.in.Keyboard[sc_Escape]);
+		//IN_qb(sc_Enter, &gvar);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
+		if(IN_KeyDown(88, &gvar))	//speed
 		{
 			switch(gvar.kurokku.fpscap)
 			{
@@ -99,10 +105,10 @@ main(int argc, char *argv[])
 					gvar.kurokku.fpscap=0;
 				break;
 			}
-			//IN_Ack();
+			//IN_Ack(){}
 		}
 	}
-	IN_Shutdown();
+	IN_Shutdown(&gvar);
 		//Shutdown16(&gvar);
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");