OH OH OH MY GOD ON HO OH!!

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 0858441dfabb0b2556a2081c3b4b82e8fca62647..687ec6499eb111009bd25526645d399881b459a6 100644 (file)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -806,7 +806,7 @@ IN_ReadControl(int playnum,player_t *player)
                        int                     dx,dy;\r
                        Motion          mx,my;\r
                        ControlType     type;
-                       word conpee;\r
+                       sword conpee;\r
 register       KeyboardDef     *def;\r
 \r
        dx = dy = 0;\r
@@ -850,19 +850,19 @@ 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]){
+                       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->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