wwwww

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

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