From: sparky4 <sparky4@cock.li>
Date: Mon, 29 Jun 2015 14:10:07 +0000 (-0500)
Subject: wwwwwwwwww
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=95e366967cb6c9b1bc7a216eccba3492286c8cc9;p=16.git

wwwwwwwwww
	modified:   16.LIB
	modified:   16/INPUTEST.EXE
	modified:   16/src/lib/16_in.c
	modified:   inputest.exe
	modified:   src/lib/16_in.c
---

diff --git a/16.LIB b/16.LIB
index 56c3dbd4..a0acda09 100644
Binary files a/16.LIB and b/16.LIB differ
diff --git a/16/INPUTEST.EXE b/16/INPUTEST.EXE
index 24896837..9b3ec195 100644
Binary files a/16/INPUTEST.EXE and b/16/INPUTEST.EXE differ
diff --git a/16/src/lib/16_in.c b/16/src/lib/16_in.c
index 97014426..1abf31a3 100644
--- a/16/src/lib/16_in.c
+++ b/16/src/lib/16_in.c
@@ -674,6 +674,16 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
 	)
 		nt = ctrl_Keyboard1;
+	inpu.KbdDefs[0].button0 = 0x1d;
+	inpu.KbdDefs[0].button1 = 0x38;
+	//in.KbdDefs[0].upleft = 0x47;
+	inpu.KbdDefs[0].up = 0x48;
+	//in.KbdDefs[0].upright = 0x49;
+	inpu.KbdDefs[0].left = 0x4b;
+	inpu.KbdDefs[0].right = 0x4d;
+	//in.KbdDefs[0].downleft = 0x4f;
+	inpu.KbdDefs[0].down = 0x50;
+	//in.KbdDefs[0].downright = 0x51;
 	IN_SetControlType(0,player,nt);
 }
 
diff --git a/inputest.exe b/inputest.exe
index 0ac3e6a6..cfe870f1 100644
Binary files a/inputest.exe and b/inputest.exe differ
diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 55afb211..1abf31a3 100644
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -55,11 +55,12 @@ struct inconfig
 	char		LastASCII;
 	ScanCode	LastScan;
 
-	KeyboardDef	KbdDefs[MaxKbds];// = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};
+	KeyboardDef	KbdDefs[MaxKbds];
 	JoystickDef	JoyDefs[MaxJoys];
 	JoypadDef	JoypadDefs[MaxPads];
 } inpu;
 
+//extern inconfig inpu;
 //inpu.KbdDefs = {0x1d,0x38,/*0x47,*/0x48,/*0x49,*/0x4b,0x4d,/*0x4f,*/0x50/*,0x51*/};
 
 /*
@@ -673,6 +674,16 @@ IN_Default(boolean gotit,player_t *player,ControlType nt)
 	|| 	((nt == ctrl_Joypad2) && !inpu.JoyPadPresent[1])
 	)
 		nt = ctrl_Keyboard1;
+	inpu.KbdDefs[0].button0 = 0x1d;
+	inpu.KbdDefs[0].button1 = 0x38;
+	//in.KbdDefs[0].upleft = 0x47;
+	inpu.KbdDefs[0].up = 0x48;
+	//in.KbdDefs[0].upright = 0x49;
+	inpu.KbdDefs[0].left = 0x4b;
+	inpu.KbdDefs[0].right = 0x4d;
+	//in.KbdDefs[0].downleft = 0x4f;
+	inpu.KbdDefs[0].down = 0x50;
+	//in.KbdDefs[0].downright = 0x51;
 	IN_SetControlType(0,player,nt);
 }