wwww inputest.exe wwww

diff --git a/src/inputest.c b/src/inputest.c
index 8913b08682e5d1e55d73c02201cc7ae2a658cc3a..f67562b4320bfeac8041a6f46e4a6d7b8a70541f 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -32,6 +32,7 @@ main(int argc, char *argv[])
        //extern struct inconfig inpu;\r
        testkeyin=0;\r
        testcontrolnoisy=1;\r
+       testctrltype=1;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index bfa3ba8547679506e5fc0a8880456e06459cc973..89e7beda255b571d3393d9382b8a85205fa51ef2 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
@@ -671,16 +671,16 @@ void
 IN_Default(boolean gotit,player_t *player,ControlType nt)\r
 {\r
        int i;\r
-       if\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
+               nt = ctrl_Keyboard1;*/\r
        inpu.KbdDefs[0].button0 = 0x1c;\r
        inpu.KbdDefs[0].button1 = 0x38;\r
        //in.KbdDefs[0].upleft = 0x47;\r
@@ -842,6 +842,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
@@ -896,8 +897,8 @@ register    KeyboardDef     *def;
                                buttons += 1 << 1;\r
                        realdelta = false;\r
                        break;\r
-               case ctrl_Joypad1:\r
-               case ctrl_Joypad2:\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

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index bf0755e7a300c20f2dbd3ca0b43248c4677ec1b2..9b2705859385605f403125987974f19bf8c860ae 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -42,7 +42,7 @@
 //#define TESTCONTROLNOISY\r
 #endif\r
 \r
-extern byte testkeyin,testcontrolnoisy;\r
+extern byte testkeyin,testcontrolnoisy,testctrltype;\r
 \r
 //if else for gfxtesting and direction\r
 //player[pn].d == 2 ||\r
@@ -169,8 +169,8 @@ typedef     enum            {
                                                ctrl_Joystick,\r
                                                        ctrl_Joystick1 = ctrl_Joystick,ctrl_Joystick2,\r
                                                ctrl_Mouse,\r
-                                               ctrl_Joypad,\r
-                                                       ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2\r
+//                                             ctrl_Joypad,\r
+//                                                     ctrl_Joypad1 = ctrl_Joypad,ctrl_Joypad2\r
                                        } ControlType;\r
 typedef        enum            {\r
                                                motion_Left = -1,motion_Up = -1,\r
@@ -211,10 +211,10 @@ typedef   struct          {
                                                                        joyMultXL,joyMultYL,\r
                                                                        joyMultXH,joyMultYH;\r
                                        } JoystickDef;\r
-typedef        struct\r
-{\r
-       boolean w;\r
-} JoypadDef;\r
+// typedef     struct\r
+// {\r
+//     boolean w;\r
+// } JoypadDef;\r
 \r
 typedef        struct\r
 {\r

diff --git a/src/lib/doslib b/src/lib/doslib
index 8769e1e077daded1a3d9b4a5a05363747381a6ec..8b4167100563ce243bb334dfa58da6314756cca2 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 8769e1e077daded1a3d9b4a5a05363747381a6ec
+Subproject commit 8b4167100563ce243bb334dfa58da6314756cca2

diff --git a/src/lib/jsmn b/src/lib/jsmn
index b77d84ba48e057aa464b6c6b6f6209e632918cb3..bbc6755fce14c713f9bb4ba47c688d15efc1394b 160000 (submodule)
--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit b77d84ba48e057aa464b6c6b6f6209e632918cb3
+Subproject commit bbc6755fce14c713f9bb4ba47c688d15efc1394b