X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=b2f31362237cef18f3baccae94ddf4c3745861f1;hb=1287746074527ec8af4c6ca515802e5a72d0ef05;hp=0858441dfabb0b2556a2081c3b4b82e8fca62647;hpb=69d15b1e78605f14f225f175110e929bd747cfbb;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 0858441d..b2f31362 100644
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -806,7 +806,7 @@ IN_ReadControl(int playnum,player_t *player)
 			int			dx,dy;
 			Motion		mx,my;
 			ControlType	type;
-			word conpee;
+			sword conpee;
 register	KeyboardDef	*def;
 
 	dx = dy = 0;
@@ -850,19 +850,19 @@ register	KeyboardDef	*def;
 			else if (Keyboard[def->downright])
 				mx = motion_Right,my = motion_Down;*/
 
-			//if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+			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)
+			}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){
+			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])
 				buttons += 1 << 0;
 			if (inpu.Keyboard[def->button1])
@@ -1208,8 +1208,10 @@ void IN_ClearKey(byte code)
 	}
 
 boolean IN_qb(byte kee)
-{
-	printf("%u\n", inpu.Keyboard[kee]);
+{
+	#ifdef TESTKEYIN
+	printf("%u\n", inpu.Keyboard[kee]);
+	#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }