wwww

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/fmemtest.upx b/fmemtest.upx
new file mode 100755 (executable)
index 0000000..e69de29

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 778d1a1072bd40a4e516ff47bcce9ce0fbb4877c..8d94ab0f1f1dd27465aa27a66a43194ffc48371f 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -86,7 +86,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....
 #
@@ -292,6 +292,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/scroll.upx b/scroll.upx
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/src/inputest.c b/src/inputest.c
index f5a9e8526b1bb685fb16b4201bcb6b3ab629a5c8..8913b08682e5d1e55d73c02201cc7ae2a658cc3a 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
        testkeyin=0;\r
        testcontrolnoisy=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

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 801759ad4757d3fceec5db029144c655b1d42147..bfa3ba8547679506e5fc0a8880456e06459cc973 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -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
@@ -895,6 +896,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 +909,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/doslib b/src/lib/doslib
index 898ac03054dfd25c104b26cbe30eac933fb35c0a..8769e1e077daded1a3d9b4a5a05363747381a6ec 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 898ac03054dfd25c104b26cbe30eac933fb35c0a
+Subproject commit 8769e1e077daded1a3d9b4a5a05363747381a6ec