Merge branch 'master' of https://github.com/sparky4/16

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 5d60d6d60e78e1af13b275638429132da72c4a07..e3807d6e7895885b8654ce8e26e6d6ef4c604fc5 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -676,7 +676,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
        ||      ((nt == ctrl_Joystick2) && !inpu.JoysPresent[1])\r
        ||      ((nt == ctrl_Mouse) && !inpu.MousePresent)\r
        )\r
-               nt = ctrl_Keyboard1;// nt = ctrl_Joystick1;//temp\r
+               nt = ctrl_Keyboard1;\r
        inpu.KbdDefs[0].button0 = 0x1c;\r
        inpu.KbdDefs[0].button1 = 0x38;\r
        //in.KbdDefs[0].upleft = 0x47;\r