made inputtest.c to force use joystick w

diff --git a/src/inputest.c b/src/inputest.c
index 4345a49c81eb780435b46c0335c8e550fb32ec4f..3722c1754cbd8b170e6bd9bcbd778fe13b035230 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -34,6 +34,7 @@ main(int argc, char *argv[])
        testcontrolnoisy=1;\r
        IN_Startup();\r
        IN_Default(0,&player,ctrl_Joystick1);\r
+       IN_SetControlType(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r
        player[0].q=1;\r
        player[0].d=2;\r

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

diff --git a/src/lib/doslib b/src/lib/doslib
index 3c5e0ae378b3dfce8511f6287acd836cb4d13e70..d7165e9733719fc4197bfdaaeae9998189fa6c54 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 3c5e0ae378b3dfce8511f6287acd836cb4d13e70
+Subproject commit d7165e9733719fc4197bfdaaeae9998189fa6c54

diff --git a/test2.exe b/test2.exe
new file mode 100755 (executable)
index 0000000..de37efa
Binary files /dev/null and b/test2.exe differ