From: sparky4 <sparky4@cock.li>
Date: Fri, 1 Apr 2016 15:07:05 +0000 (-0500)
Subject: wwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;ds=inline;h=55220245f3cd57d41f6ac40ef55f851f9b9d5efd;p=16.git

wwww
---

diff --git a/16/doslib b/16/doslib
new file mode 160000
index 00000000..97569044
--- /dev/null
+++ b/16/doslib
@@ -0,0 +1 @@
+Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342
diff --git a/fmemtest.upx b/fmemtest.upx
new file mode 100755
index 00000000..e69de29b
diff --git a/joytest.exe b/joytest.exe
new file mode 100755
index 00000000..b8072513
Binary files /dev/null and b/joytest.exe differ
diff --git a/makefile b/makefile
index 778d1a10..8d94ab0f 100755
--- 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
index 00000000..e69de29b
diff --git a/src/inputest.c b/src/inputest.c
index f5a9e852..8913b086 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -33,7 +33,7 @@ main(int argc, char *argv[])
 	testkeyin=0;
 	testcontrolnoisy=1;
 	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
+	IN_Default(0,&player,ctrl_Joystick1);
 	//while(!IN_KeyDown(sc_Escape))
 	player[0].q=1;
 	player[0].d=2;
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 801759ad..bfa3ba85 100755
--- 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;
 
 	inst.IN_Started = true;
+
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -895,6 +896,8 @@ register	KeyboardDef	*def;
 				buttons += 1 << 1;
 			realdelta = false;
 			break;
+		case ctrl_Joypad1:
+		case ctrl_Joypad2:
 		case ctrl_Joystick1:
 		case ctrl_Joystick2:
 			INL_GetJoyDelta(type - ctrl_Joystick,&dx,&dy,false);
@@ -906,10 +909,6 @@ register	KeyboardDef	*def;
 			buttons = INL_GetMouseButtons();
 			realdelta = true;
 			break;
-		case ctrl_Joypad1:
-		case ctrl_Joypad2:
-			printf("wwww");
-			break;
 		}
 #ifdef DEMO0
 	}
diff --git a/src/lib/doslib b/src/lib/doslib
index 898ac030..8769e1e0 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 898ac03054dfd25c104b26cbe30eac933fb35c0a
+Subproject commit 8769e1e077daded1a3d9b4a5a05363747381a6ec