X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=2fa528996eb2388320fda8994f406132bdd6b21c;hb=482dcb216b9068878dbfcf8265d9b7fd2cdc82a2;hp=a8c97fcac13e5d1917d9ffdb10124fc39fcb2fc7;hpb=0f1f17dc05c1f9530651580fc5c23b121b8969ab;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index a8c97fca..2fa52899 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,6 +38,8 @@
 
 #include "src/lib/16_in.h"
 
+word testkeyin=1,testcontrolnoisy=0;
+
 /*
 =============================================================================
 
@@ -235,7 +237,7 @@ static	boolean	special;
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
 //#ifdef TESTKEYIN
-	if(testkeyin) printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
+	if(testkeyin > 0) printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
 //endif
 	outp(0x20,0x20);
 }
@@ -849,17 +851,18 @@ register	KeyboardDef	*def;
 				mx = motion_Left,my = motion_Down;
 			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] && !inpu.Keyboard[def->down] && player[playnum].d == 2))// || player[playnum].info.dir == 0)
 				my = motion_Up;
 			if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].d == 2))// || player[playnum].info.dir == 4)
 				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] && player[playnum].d == 2))// || player[playnum].info.dir == 1)
 				mx = motion_Left;
 			if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].d == 2))// || player[playnum].info.dir == 3)
 				mx = motion_Right;
-			//}
+			}
+			//input from player
 			if (inpu.Keyboard[def->button0])
 				buttons += 1 << 0;
 			if (inpu.Keyboard[def->button1])
@@ -940,7 +943,7 @@ register	KeyboardDef	*def;
 	}
 #endif
 //#ifdef TESTCONTROLNOISY
-if(testcontrolnoisy)
+if(testcontrolnoisy > 0)
 if((inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])&& player[playnum].info.dir!=2)
 {
 	printf("(mx)=%d	", mx);
@@ -1212,7 +1215,7 @@ void IN_ClearKey(byte code)
 boolean IN_qb(byte kee)
 {
 //#ifdef TESTKEYIN
-	if(testkeyin) printf("%u\n", inpu.Keyboard[kee]);
+//	if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
 //#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;