From: sparky4 <sparky4@cock.li>
Date: Sun, 21 Aug 2016 04:21:01 +0000 (-0500)
Subject: made inputtest.c to force use joystick w
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=d67e5db49b9eee3277635164d2f4984081085dcc;p=16.git

made inputtest.c to force use joystick w
---

diff --git a/src/inputest.c b/src/inputest.c
index 4345a49c..3722c175 100755
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -34,6 +34,7 @@ main(int argc, char *argv[])
 	testcontrolnoisy=1;
 	IN_Startup();
 	IN_Default(0,&player,ctrl_Joystick1);
+	IN_SetControlType(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 5d60d6d6..e3807d6e 100755
--- 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])
 	|| 	((nt == ctrl_Mouse) && !inpu.MousePresent)
 	)
-		nt = ctrl_Keyboard1;// nt = ctrl_Joystick1;//temp
+		nt = ctrl_Keyboard1;
 	inpu.KbdDefs[0].button0 = 0x1c;
 	inpu.KbdDefs[0].button1 = 0x38;
 	//in.KbdDefs[0].upleft = 0x47;
diff --git a/src/lib/doslib b/src/lib/doslib
index 3c5e0ae3..d7165e97 160000
--- 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
index 00000000..de37efa6
Binary files /dev/null and b/test2.exe differ