X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=be6ac4a2a725284c1f958afa1ada71b7fd4b86e5;hb=f140a355c36fae1da7e962c9828983e1fa131ad1;hp=f5a9e8526b1bb685fb16b4201bcb6b3ab629a5c8;hpb=623ca4b01f2db170c2273d5bc9c538be78d16c4c;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index f5a9e852..be6ac4a2 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
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -30,10 +30,11 @@ main(int argc, char *argv[])
 	global_game_variables_t gvar;
 	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
-	testkeyin=0;
-	testcontrolnoisy=1;
+	dbg_testkeyin=0;
+	dbg_testcontrolnoisy=1;
 	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	IN_Default(0,&player,ctrl_Joystick1);
+	IN_SetControlType(0,&player,ctrl_Joystick1);
 	//while(!IN_KeyDown(sc_Escape))
 	player[0].q=1;
 	player[0].d=2;
@@ -42,7 +43,7 @@ main(int argc, char *argv[])
 	start_timer(&gvar);
 	while(!IN_KeyDown(sc_Escape))
 	{
-		shinkutxt(&gvar);
+		//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)
@@ -104,6 +105,6 @@ main(int argc, char *argv[])
 	//printf("%u\n", in.Keyboard[sc_Escape]);
 	printf("inputest.exe ");
 	printf("version %s\n", VERSION);
-	printf("testkeyin=%u\n", testkeyin);
-	printf("testcontrolnoisy=%u\n", testcontrolnoisy);
+	printf("testkeyin=%u\n", dbg_testkeyin);
+	printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
 }