From: sparky4 <sparky4@cock.li>
Date: Sun, 13 Mar 2016 05:42:26 +0000 (-0600)
Subject: pdir printf(%c%d %c%d %c%d %c%dn, dirchar(0), inpu.Keyboard[def->up], dirchar(4)... 
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=d46892823ee9473aa8d5579869a095eb6e35f6e7;p=16.git

pdir printf(%c%d %c%d %c%d %c%dn, dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
---

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 7d4b32d9..40705855 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -855,18 +855,19 @@ register	KeyboardDef	*def;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
 			if(DIRECTIONIFELSEGFXTEST)
-			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+			{
+//			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
 //				if(testcontrolnoisy > 0){ printf("ud "); printf("%u ", inpu.Keyboard[def->up]); printf("%u ", inpu.Keyboard[def->down]);}
-			if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]) || player[pn].pdir == 0)
-				my = motion_Up;
-			if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]) || player[pn].pdir == 4)
-				my = motion_Down;
-			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
+				if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))// || player[pn].pdir != 4)
+					my = motion_Up;
+				if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))// || player[pn].pdir != 0)
+					my = motion_Down;
+//			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
 //				if(testcontrolnoisy > 0){ printf("lr "); printf("%u ", inpu.Keyboard[def->left]); printf("%u ", inpu.Keyboard[def->right]); }
-			if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]) || player[pn].pdir == 1)
-				mx = motion_Left;
-			if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]) || player[pn].pdir == 3)
-				mx = motion_Right;
+				if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]))// || player[pn].pdir != 3)
+					mx = motion_Left;
+				if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)
+					mx = motion_Right;
 			}
 			//input from player
 			if (inpu.Keyboard[def->button0])
@@ -919,7 +920,7 @@ register	KeyboardDef	*def;
 	player[pn].info.dir = DirTable[conpee];
 
 	//TODO: overwriting direction must be added
-	if(player[pn].d==2) player[pn].pdir=DirTable[conpee];
+	if(DirTable[conpee]!=2)	player[pn].pdir=DirTable[conpee];
 	if(player[pn].q==1 && (mx!=motion_None || my!=motion_None))
 	{
 		player[pn].d = player[pn].info.dir;
@@ -958,7 +959,7 @@ if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->lef
 	printf("cpee=%c ", dirchar(conpee));
 	//printf("(mx)=%d	", mx);
 	//printf("(my)=%d	", my);
-	printf("pdir=%c d=%c dir=%c", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));
+	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));
 	printf("%c%d %c%d %c%d %c%d\n", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
 }
 //#endif