more

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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 801759ad4757d3fceec5db029144c655b1d42147..925eaeebd976ec8e27d02afd617d8d51c2f0fe96 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -38,7 +38,7 @@
 \r
 #include "src/lib/16_in.h"\r
 \r
-byte testkeyin=0,testcontrolnoisy=0;\r
+byte testkeyin=0,testcontrolnoisy=0,testctrltype=0;\r
 \r
 /*\r
 =============================================================================\r
@@ -51,7 +51,7 @@ struct inconfig
 {\r
        boolean                 MousePresent;\r
        boolean                 JoysPresent[MaxJoys];\r
-       boolean                 JoyPadPresent[MaxPads];\r
+//     boolean                 JoyPadPresent[MaxPads];\r
        boolean         Keyboard[NumCodes];\r
        boolean         Paused;\r
        char            LastASCII;\r
@@ -59,7 +59,7 @@ struct inconfig
 \r
        KeyboardDef     KbdDefs[MaxKbds];\r
        JoystickDef     JoyDefs[MaxJoys];\r
-       JoypadDef       JoypadDefs[MaxPads];\r
+//     JoypadDef       JoypadDefs[MaxPads];\r
 } inpu;\r
 \r
 //extern inconfig inpu;\r
@@ -659,6 +659,7 @@ IN_Startup()
                inpu.JoysPresent[i] = checkjoys? INL_StartJoy(i) : false;\r
 \r
        inst.IN_Started = true;\r
+\r
 }\r
 \r
 ///////////////////////////////////////////////////////////////////////////\r
@@ -670,14 +671,15 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
        int i;\r
+       if(testctrltype==0)\r
        if\r
        (\r
                (!gotit)\r
        ||      ((nt == ctrl_Joystick1) && !inpu.JoysPresent[0])\r
        ||      ((nt == ctrl_Joystick2) && !inpu.JoysPresent[1])\r
        ||      ((nt == ctrl_Mouse) && !inpu.MousePresent)\r
-       ||      ((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])\r
-       ||      ((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])\r
+//     ||      ((nt == ctrl_Joypad1) && !inpu.JoyPadPresent[0])\r
+//     ||      ((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])\r
        )\r
                nt = ctrl_Keyboard1;\r
        inpu.KbdDefs[0].button0 = 0x1c;\r
@@ -841,6 +843,7 @@ register    KeyboardDef     *def;
        else\r
        {\r
 #endif\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
@@ -895,6 +898,8 @@ register    KeyboardDef     *def;
                                buttons += 1 << 1;\r
                        realdelta = false;\r
                        break;\r
+//             case ctrl_Joypad1:\r
+//             case ctrl_Joypad2:\r
                case ctrl_Joystick1:\r
                case ctrl_Joystick2:\r
                        INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);\r
@@ -906,10 +911,6 @@ register   KeyboardDef     *def;
                        buttons = INL_GetMouseButtons();\r
                        realdelta = true;\r
                        break;\r
-               case ctrl_Joypad1:\r
-               case ctrl_Joypad2:\r
-                       printf("wwww");\r
-                       break;\r
                }\r
 #ifdef DEMO0\r
        }\r