X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_in.c;h=8c0dbc695bd54210d249c3e8850c0b54a1c298d2;hb=ff67fe588fddfa1c10cab13a5ca8dfaa4589bec7;hp=9340dd6918578eb1e7780f5915d798140824df43;hpb=3237f100b93a7d331880b7bf92305c891872040e;p=16.git

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 9340dd69..8c0dbc69 100755
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,9 @@
 
 #include "src/lib/16_in.h"
 
-boolean testkeyin=0,testcontrolnoisy=0;
+#ifdef __DEBUG_InputMgr__
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;
+#endif
 
 /*
 =============================================================================
@@ -234,9 +236,9 @@ static	boolean	special;
 
 	if (INL_KeyHook && !special)
 		INL_KeyHook();
-//#ifdef TESTKEYIN
-	if(testkeyin > 0) printf("%c	%u	[0x%x %u]	%u\n", c, c, k, k, inpu.Keyboard[k]);
-//endif
+#ifdef __DEBUG_InputMgr__
+	if(dbg_testkeyin > 0) printf("%c	%u	[0x%x %u]	%u\n", c, c, k, k, inpu.Keyboard[k]);
+#endif
 	outp(0x20,0x20);
 }
 
@@ -881,7 +883,9 @@ register	KeyboardDef	*def;
 						default:
 						break;
 					}
-					//if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
+#ifdef __DEBUG_InputMgr__
+					//if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c	", dirchar(player[pn].pdir)); }
+#endif
 				}
 			}
 			//input from player
@@ -962,17 +966,19 @@ register	KeyboardDef	*def;
 		}
 	}
 #endif
-if(testcontrolnoisy > 0)
+#ifdef __DEBUG_InputMgr__
+if(dbg_testcontrolnoisy > 0)
 if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] || inpu.Keyboard[def->left] || inpu.Keyboard[def->right])*/ || player[pn].q>1)
 {
 	//printf("b1=%u b2=%u b3=%u b4=%u	", player[pn].info.button0, player[pn].info.button1, player[pn].info.button2, player[pn].info.button3);
 	//printf("q=%d ", player[pn].q);
 	//printf("cpee=%c ", dirchar(conpee));
 	printf("pdir=%c d=%c dir=%c ", dirchar(player[pn].pdir), dirchar(player[pn].d), dirchar(player[pn].info.dir));
-	if(realdelta) printf("dx=%d	dy=%d	mx=%d	my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);
-	else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
+	/*if(realdelta) */printf("dx=%d	dy=%d	mx=%d	my=%d", player[pn].info.x, player[pn].info.y, player[pn].info.xaxis, player[pn].info.yaxis);
+	//else if(!realdelta) printf("%c%d %c%d %c%d %c%d", dirchar(0), inpu.Keyboard[def->up], dirchar(4), inpu.Keyboard[def->down], dirchar(1), inpu.Keyboard[def->left], dirchar(3), inpu.Keyboard[def->right]);
 	printf("\n");
 }
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -1155,6 +1161,9 @@ IN_Ack()
 {
 	word	i;
 
+	if (!inst.IN_Started)
+		return;
+
 	IN_ClearKey(inpu.LastScan);
 	inpu.LastScan = sc_None;
 
@@ -1236,9 +1245,9 @@ void IN_ClearKey(byte code)
 
 boolean IN_qb(byte kee)
 {
-//#ifdef TESTKEYIN
-//	if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
-//#endif
+#ifdef __DEBUG_InputMgr__
+//	if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);
+#endif
 	if(inpu.Keyboard[kee]==true) return 1;
 	else return 0;
 }