X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=801759ad4757d3fceec5db029144c655b1d42147;hb=e9225c9f63fad34a97d4b9652ea6b60743b0e7a4;hp=7f467cce073ab6425d015ca18446d59700bcb24c;hpb=dbcc7e74e91c799c406dd6eded9a4b71f3e3da32;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 7f467cce..801759ad 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -857,19 +857,18 @@ register	KeyboardDef	*def;
 				mx = motion_Right,my = motion_Down;*/
 			if(DIRECTIONIFELSE)
 			{
-			//if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
 				if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]))
 					my = motion_Up;
 				if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up]))
 					my = motion_Down;
-			//}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
+			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
 				if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]))
 					mx = motion_Left;
 				if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left]))// || player[pn].pdir != 1)
 					mx = motion_Right;
-
-			//}else
-				if(mx+my>1<mx+my)
+			}else
+				//if(mx+my!=1 && mx+my!=-1 && mx!=my!=0)
 				{	//2 keys pressed
 					switch (player[pn].pdir)
 					{
@@ -887,7 +886,7 @@ register	KeyboardDef	*def;
 						break;
 					}
 					if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
-				}
+				}//else printf("				");
 			}
 			//input from player
 			if (inpu.Keyboard[def->button0])
@@ -980,6 +979,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("[%d]	", mx+my);
 	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]);
 }