From: sparky4 <sparky4@cock.li>
Date: Sun, 12 Jul 2015 21:46:11 +0000 (-0500)
Subject: ok input is very close to final!
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=055b44b4ebaf07920e351c7e29c1215f0602d024;p=proj16%2F16.git

ok input is very close to final!
	modified:   inputest.exe
	modified:   src/lib/16_in.c
---

diff --git a/inputest.exe b/inputest.exe
index cf2dda4e..4f9190c4 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 6b1addd7..687ec649 100644
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -852,15 +852,15 @@ register	KeyboardDef	*def;
 
 			if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
 			
-			if((inpu.Keyboard[def->up] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 0)
+			if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 0)
 				my = motion_Up;
-			else if((inpu.Keyboard[def->down] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 4)
+			if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 4)
 				my = motion_Down;
 
 			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
-			if((inpu.Keyboard[def->left] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 1)
+			if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 1)
 				mx = motion_Left;
-			else if((inpu.Keyboard[def->right] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 3)
+			if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 3)
 				mx = motion_Right;
 			}
 			if (inpu.Keyboard[def->button0])