X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=62e2d8177b55a9fd0173487079b9f20bfc610eaa;hb=fdba3fc0da3fb172176d9f74a8c4c55a23250e8a;hp=03f7a331f48d68f19bfb0103adcd71b90fa1f944;hpb=b944e5a4e57c1a1ba44dff4ffafdee4edd5b5d99;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index 03f7a331..62e2d817 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -33,7 +33,8 @@ main(int argc, char *argv[])
 	testkeyin=0;
 	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)