X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=84804f6cb9e1cda1338dbc19b63daa3bb6a85a83;hb=e2a4dec178a27a81d11b0a717eb589ae8e48a2f7;hp=00fe3f1e63bdee490ab3c38af4bf23d08c1b8475;hpb=b21fed9969cd357cd0aff8040453aa0677592de0;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 00fe3f1e..84804f6c 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -234,9 +234,9 @@ static	boolean	special;
 
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
-	#ifdef TESTKEYIN
-	printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
-	#endif
+//#ifdef TESTKEYIN
+	if(testkeyin > 0) printf("%c %x %u\n", c, k, inpu.Keyboard[k]);
+//endif
 	outp(0x20,0x20);
 }
 
@@ -370,10 +370,10 @@ static void
 INL_GetJoyDelta(word joy,int *dx,int *dy,boolean adaptive)
 {
 	word		x,y;
-	dword	time;
-	dword TimeCount = *clockdw;
+	word	time;
+	word TimeCount = *clockw;
 	JoystickDef	*def;
-static	dword	lasttime;
+static	word	lasttime;
 
 	IN_GetJoyAbs(joy,&x,&y);
 	def = inpu.JoyDefs + joy;
@@ -465,8 +465,8 @@ register	word	result;
 word
 IN_GetJoyButtonsDB(word joy)
 {
-	dword TimeCount = *clockdw;
-	dword	lasttime;
+	word TimeCount = *clockw;
+	word	lasttime;
 	word		result1,result2;
 
 	do
@@ -860,6 +860,7 @@ register	KeyboardDef	*def;
 			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])
@@ -939,14 +940,15 @@ register	KeyboardDef	*def;
 		}
 	}
 #endif
-#ifdef TESTCONTROLNOISY
+//#ifdef 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);
 	printf("(my)=%d	", my);
 	printf("dir=%d\n", player[playnum].info.dir);
 }
-#endif
+//#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1180,8 +1182,8 @@ IN_IsUserInput()
 boolean
 IN_UserInput(dword delay,boolean clear)
 {
-	dword TimeCount = *clockdw;
-	dword	lasttime;
+	word TimeCount = *clockw;
+	word	lasttime;
 
 	lasttime = TimeCount;
 	do
@@ -1210,9 +1212,9 @@ void IN_ClearKey(byte code)
 
 boolean IN_qb(byte kee)
 {
-	#ifdef TESTKEYIN
-	printf("%u\n", inpu.Keyboard[kee]);
-	#endif
+//#ifdef TESTKEYIN
+	if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
+//#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }