Merge remote-tracking branch 'upstream/master'

diff --git a/16/doslib b/16/doslib
new file mode 160000 (submodule)
index 0000000..9756904
--- /dev/null
+++ b/16/doslib
@@ -0,0 +1 @@
+Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342

diff --git a/BAKA PEEEEEEEEEEEEEEEE.jpg b/BAKA PEEEEEEEEEEEEEEEE.jpg
new file mode 100755 (executable)
index 0000000..6524694
Binary files /dev/null and b/BAKA PEEEEEEEEEEEEEEEE.jpg differ

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

diff --git a/makefile b/makefile
index c156f741e9cc78e183783fb165f8c86234a909d5..d77bf7c0a0a808fd74ff512bad362f257337a5f1 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -87,7 +87,7 @@ TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe
 #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
 EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
-all: $(EXEC)
+all: $(EXEC)  joytest.exe
 
 #$(16LIBOBJS) => 16.lib bug....
 #
@@ -293,6 +293,8 @@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh
 $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
+joytest.exe:
+       cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe
 #$(DOSLIBLIBS): .symbolic
 #      @cd $(DOSLIB)
 #      @.$(DIRSEP)buildall.sh

diff --git a/src/inputest.c b/src/inputest.c
index f5a9e8526b1bb685fb16b4201bcb6b3ab629a5c8..edd86d62c7cbc968126892393132fdbfdb066733 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -32,8 +32,9 @@ 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_Joystick);\r
+       IN_Default(0,&player,ctrl_Joystick1);\r
        //while(!IN_KeyDown(sc_Escape))\r
        player[0].q=1;\r
        player[0].d=2;\r
@@ -106,4 +107,5 @@ main(int argc, char *argv[])
        printf("version %s\n", VERSION);\r
        printf("testkeyin=%u\n", testkeyin);\r
        printf("testcontrolnoisy=%u\n", testcontrolnoisy);\r
+       printf("testctrltype=%u\n", testctrltype);\r
 }\r

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

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 be9c7f3c9abb00385d07fa9baac9d5ead2f6ce04..8b4167100563ce243bb334dfa58da6314756cca2 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit be9c7f3c9abb00385d07fa9baac9d5ead2f6ce04
+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