Commit MetaInfo

Revision9540760f9429bfe71894c801e85cec95e3887f8c (tree)
Time2021-09-25 01:02:00
Authorsparky4 <sparky4@cock...>
Commitersparky4

Log Message

no idea how to get joy buttons 2 and 3 to function.

Change Summary

Incremental Difference

--- a/src/inputest.c
+++ b/src/inputest.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
4545 ctrl_Keyboard1
4646 #endif
4747 #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)
48- ctrl_Joystick2
48+ ctrl_Joystick1
4949 #endif
5050 #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)
5151 ctrl_Mouse
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -1298,9 +1298,9 @@ byte IN_MouseButtons (global_game_variables_t *gvar)
12981298 ===================
12991299 */
13001300
1301-byte IN_JoyButtons (void)
1301+word IN_JoyButtons (void)
13021302 {
1303- byte joybits;
1303+ word joybits;
13041304
13051305 joybits = inportb(0x201); // Get all the joystick buttons
13061306 joybits >>= 4; // only the high bits are useful
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -242,7 +242,7 @@ extern byte *IN_GetScanName(ScanCode);
242242
243243
244244 byte IN_MouseButtons (global_game_variables_t *gvar);
245-byte IN_JoyButtons (void);
245+word IN_JoyButtons (void);
246246
247247 void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar);
248248 void IN_StartAck(global_game_variables_t *gvar);
Show on old repository browser