====XMS MOSTLY translated but crashes EXMMTEST.EXE ====

[16.git] / src / lib / 16_in.c

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 85153939ccd443b05db0491f353dd635560297f5..8c0dbc695bd54210d249c3e8850c0b54a1c298d2 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,9 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-boolean testkeyin=0,testcontrolnoisy=0;\r
+#ifdef __DEBUG_InputMgr__\r
+boolean dbg_testkeyin=0,dbg_testcontrolnoisy=0;\r
+#endif\r
 \r
 /*\r
 =============================================================================\r
@@ -234,9 +236,9 @@ static      boolean special;
 \r
        if (INL_KeyHook && !special)\r
                INL_KeyHook();\r
-//#ifdef TESTKEYIN\r
-       if(testkeyin > 0) printf("%c    %u      [0x%x %u]       %u\n", c, c, k, k, inpu.Keyboard[k]);\r
-//endif\r
+#ifdef __DEBUG_InputMgr__\r
+       if(dbg_testkeyin > 0) printf("%c        %u      [0x%x %u]       %u\n", c, c, k, k, inpu.Keyboard[k]);\r
+#endif\r
        outp(0x20,0x20);\r
 }\r
 \r
@@ -881,7 +883,9 @@ register    KeyboardDef     *def;
                                                default:\r
                                                break;\r
                                        }\r
-                                       //if(testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c    ", dirchar(player[pn].pdir)); }\r
+#ifdef __DEBUG_InputMgr__\r
+                                       //if(dbg_testcontrolnoisy > 0){ printf("dir=%c ", dirchar(dir)); printf("pdir=%c        ", dirchar(player[pn].pdir)); }\r
+#endif\r
                                }\r
                        }\r
                        //input from player\r
@@ -962,7 +966,8 @@ register    KeyboardDef     *def;
                }\r
        }\r
 #endif\r
-if(testcontrolnoisy > 0)\r
+#ifdef __DEBUG_InputMgr__\r
+if(dbg_testcontrolnoisy > 0)\r
 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)\r
 {\r
        //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);\r
@@ -973,6 +978,7 @@ if(player[pn].info.dir!=2/*(inpu.Keyboard[def->up] || inpu.Keyboard[def->down] |
        //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]);\r
        printf("\n");\r
 }\r
+#endif\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -1239,9 +1245,9 @@ void IN_ClearKey(byte code)
 \r
 boolean IN_qb(byte kee)\r
 {\r
-//#ifdef TESTKEYIN\r
-//     if(testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
-//#endif\r
+#ifdef __DEBUG_InputMgr__\r
+//     if(dbg_testkeyin > 0) printf("%u\n", inpu.Keyboard[kee]);\r
+#endif\r
        if(inpu.Keyboard[kee]==true) return 1;\r
        else return 0;\r
 }\r