Merge remote-tracking branch 'upstream/master'

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 89e7beda255b571d3393d9382b8a85205fa51ef2..925eaeebd976ec8e27d02afd617d8d51c2f0fe96 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -671,7 +671,8 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
        int i;\r
-       /*if\r
+       if(testctrltype==0)\r
+       if\r
        (\r
                (!gotit)\r
        ||      ((nt == ctrl_Joystick1) && !inpu.JoysPresent[0])\r
@@ -680,7 +681,7 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 //     ||      ((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])\r
 //     ||      ((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])\r
        )\r
-               nt = ctrl_Keyboard1;*/\r
+               nt = ctrl_Keyboard1;\r
        inpu.KbdDefs[0].button0 = 0x1c;\r
        inpu.KbdDefs[0].button1 = 0x38;\r
        //in.KbdDefs[0].upleft = 0x47;\r
@@ -842,7 +843,7 @@ register    KeyboardDef     *def;
        else\r
        {\r
 #endif\r
-               //if(testctrltype>0) printf("player[pn].Controls=%c\n", player[pn].Controls);\r
+               if(testctrltype>0) printf("player[pn].Controls=%c\n", player[pn].Controls);\r
                switch (type = player[pn].Controls)\r
                {\r
                case ctrl_Keyboard1:\r