X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=62e2d8177b55a9fd0173487079b9f20bfc610eaa;hb=853d93c2217c185cc589727daa02650a4704525a;hp=d4a3d44c50f6150bda75fbf381b1a3a2c0773787;hpb=53d918625e7c5e1e9da827755449d6a901e6d302;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
old mode 100644
new mode 100755
index d4a3d44c..62e2d817
--- 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.
  *
@@ -26,34 +26,85 @@
 
 void
 main(int argc, char *argv[])
-{
-	player_t player[MaxPlayers];
-	inconfig in;
-	//word i=0;
+{
+	global_game_variables_t gvar;
+	player_t player[MaxPlayers];
+	//extern struct inconfig inpu;
+	testkeyin=0;
+	testcontrolnoisy=1;
+	IN_Startup();
+	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;
 
-	in.KbdDefs[0].button0 = 0x1d;
-	in.KbdDefs[0].button1 = 0x38;
-	//in.KbdDefs[0].upleft = 0x47;
-	in.KbdDefs[0].up = 0x48;
-	//in.KbdDefs[0].upright = 0x49;
-	in.KbdDefs[0].left = 0x4b;
-	in.KbdDefs[0].right = 0x4d;
-	//in.KbdDefs[0].downleft = 0x4f;
-	in.KbdDefs[0].down = 0x50;
-	//in.KbdDefs[0].downright = 0x51;
+		//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;
 
-	if(IN_Startup(&in))
-	{
-		IN_Default(0,&player,ctrl_Joystick, &in);
-		while(!in.Keyboard[sc_Escape])
-		{
-			IN_ReadControl(0,&player, &in);
-			//printf("%u\n", in.Keyboard[sc_Escape]);
-			//printf("i=%u\n", i);
-			printf("");
-			//i++;
-		}
-		IN_Shutdown(&in);
-	}
+		//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));
+		//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("inputest.exe ");
+	printf("version %s\n", VERSION);
+	printf("testkeyin=%u\n", testkeyin);
+	printf("testcontrolnoisy=%u\n", testcontrolnoisy);
 }