X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=a573d54a8e769cf0d86fde5781dd2506a723f3a9;hb=989f287818c93cf9b1ff96c13e66720571210513;hp=e9ef73d8571fe1aa383a948197eee03f5e3815f3;hpb=91b509a59014237571bce50abc62bfbbf5315adf;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index e9ef73d8..a573d54a 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -27,20 +27,84 @@
 void
 main(int argc, char *argv[])
 {
+	global_game_variables_t gvar;
 	player_t player[MaxPlayers];
 	//extern struct inconfig inpu;
-	testkeyin=1;
-	testcontrolnoisy=1;
+	dbg_testkeyin=1;
+	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;
+	player[0].persist_aniframe=0;
+	player[0].speed=4;
+	start_timer(&gvar);
 	while(!IN_KeyDown(sc_Escape))
 	{
+		//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)
+		{
+		//right movement
+		case 3:
+			if(player[0].q<=(TILEWH/(player[0].speed)))
+			{
+				INC_PER_FRAME;
+				player[0].q++;
+			} else { player[0].q = 1; player[0].d = 2; }
+		break;
+
+		//left movement
+		case 1:
+			if(player[0].q<=(TILEWH/(player[0].speed)))
+			{
+				INC_PER_FRAME;
+				player[0].q++;
+			} else { player[0].q = 1; player[0].d = 2; }
+		break;
+
+		//down movement
+		case 4:
+			if(player[0].q<=(TILEWH/(player[0].speed)))
+			{
+				INC_PER_FRAME;
+				player[0].q++;
+			} else { player[0].q = 1; player[0].d = 2; }
+		break;
+
+		//up movement
+		case 0:
+			if(player[0].q<=(TILEWH/(player[0].speed)))
+			{
+				INC_PER_FRAME;
+				player[0].q++;
+			} else { player[0].q = 1; player[0].d = 2; }
+		break;
+	}
 		//printf("%u\n", IN_KeyDown(sc_Escape));
-		//printf("%u\n", IN_qb(sc_Escape));
+		//if(
+		IN_qb(sc_9);//>0) printf("IN_qb(sc_9)=%u\n", IN_qb(sc_9));
+		if(IN_KeyDown(88))	//speed
+		{
+			switch(gvar.kurokku.fpscap)
+			{
+				case 0:
+					gvar.kurokku.fpscap=1;
+				break;
+				case 1:
+					gvar.kurokku.fpscap=0;
+				break;
+			}
+			//IN_Ack();
+		}
 	}
 	IN_Shutdown();
 	//printf("%u\n", in.Keyboard[sc_Escape]);
-	printf("%u\n", testkeyin);
+	printf("inputest.exe ");
+	printf("version %s\n", VERSION);
+	printf("testkeyin=%u\n", dbg_testkeyin);
+	printf("testcontrolnoisy=%u\n", dbg_testcontrolnoisy);
 }