X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Finputest.c;h=1f88a3ccbafb60b665e1413093f539e577a958ae;hb=9ee2d68eb9e4c8ee46254efa06e3977cf3b36bdd;hp=d020d58c4742112063af36a3e2fb338be2447e3f;hpb=0639d60ca22d264a1fb6aed055cf1463af24045c;p=16.git

diff --git a/src/inputest.c b/src/inputest.c
index d020d58c..1f88a3cc 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 & yakui-lover
+ * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -41,10 +41,9 @@ main(int argc, char *argv[])
 	IN_Default(0,&player,ctrl_Keyboard1);
 	IN_SetControlType(0,&player,ctrl_Keyboard1);
 
-	player[0].q=1;
-	player[0].d=2;
-	player[0].persist_aniframe=0;
-	player[0].speed=4;
+	player[0].enti.q=1;
+	player[0].enti.d=2;
+	player[0].enti.speed=4;
 
 //0000	nibbletest();
 //0000	booleantest();
@@ -53,43 +52,38 @@ main(int argc, char *argv[])
 	{
 //0000		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)
+		switch(player[0].enti.d)
 		{
 		//right movement
 		case 3:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//left movement
 		case 1:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//down movement
 		case 4:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 
 		//up movement
 		case 0:
-			if(player[0].q<=(TILEWH/(player[0].speed)))
+			if(player[0].enti.q<=(TILEWH/(player[0].enti.speed)))
 			{
-				INC_PER_FRAME;
-				player[0].q++;
-			} else { player[0].q = 1; player[0].d = 2; }
+				player[0].enti.q++;
+			} else { player[0].enti.q = 1; player[0].enti.d = 2; }
 		break;
 	}
 		//printf("%u\n", IN_KeyDown(sc_Escape));