PEE!!!

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 1ee3bc943a9439b197360eb13de028fcb1be9eb6..fd812ff091a1551b1b4cc2187f50cc2828ae3b55 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -850,19 +850,18 @@ register  KeyboardDef     *def;
                        else if (Keyboard[def->downright])\r
                                mx = motion_Right,my = motion_Down;*/\r
 \r
-                       //if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
-                       \r
-                       if((inpu.Keyboard[def->up] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 0)\r
+                       if(!inpu.Keyboard[def->left] && !inpu.Keyboard[def->right]){
+                       if((inpu.Keyboard[def->up] && !inpu.Keyboard[def->down] && player[playnum].info.dir == 2) || player[playnum].info.dir == 0)\r
                                my = motion_Up;\r
-                       else if((inpu.Keyboard[def->down] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 4)\r
+                       if((inpu.Keyboard[def->down] && !inpu.Keyboard[def->up] && player[playnum].info.dir == 2) || player[playnum].info.dir == 4)\r
                                my = motion_Down;\r
 \r
-                       //}else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
-                       if((inpu.Keyboard[def->left] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 1)\r
+                       }else if(!inpu.Keyboard[def->up] && !inpu.Keyboard[def->down]){\r
+                       if((inpu.Keyboard[def->left] && !inpu.Keyboard[def->right] && player[playnum].info.dir == 2) || player[playnum].info.dir == 1)\r
                                mx = motion_Left;\r
-                       else if((inpu.Keyboard[def->right] && player[playnum].info.dir == 2))// || player[playnum].info.dir == 3)\r
+                       if((inpu.Keyboard[def->right] && !inpu.Keyboard[def->left] && player[playnum].info.dir == 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
@@ -1208,8 +1207,10 @@ void IN_ClearKey(byte code)
        }\r
 \r
 boolean IN_qb(byte kee)\r
-{\r
-       printf("%u\n", inpu.Keyboard[kee]);\r
+{
+       #ifdef TESTKEYIN\r
+       printf("%u\n", inpu.Keyboard[kee]);
+       #endif\r
        if(inpu.Keyboard[kee]==true) return 1;\r
        else return 0;\r
 }\r