many improvements for testing have been added ^^

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

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