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

diff --git a/src/inputest.c b/src/inputest.c
index 7f3b82879802d803919bf330f24f15c363fe79e1..a27c2dd5ab5182508eab1ae504e3daa2a4b0394d 100755 (executable)
--- a/src/inputest.c
+++ b/src/inputest.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
                                                                ctrl_Keyboard1\r
                                #endif\r
                                #if defined(INPUTEST_JOYSTICKPADTEST) && !defined(INPUTEST_MOUSETEST)\r
-                                                               ctrl_Joystick2\r
+                                                               ctrl_Joystick1\r
                                #endif\r
                                #if !defined(INPUTEST_JOYSTICKPADTEST) && defined(INPUTEST_MOUSETEST)\r
                                                                ctrl_Mouse\r

diff --git a/src/lib/16_in.c b/src/lib/16_in.c
index 834e3b3737f1d1a336aaaf879b925de8d1514529..6dc41edc60295023222f2113750c3c2a06121db4 100755 (executable)
--- a/src/lib/16_in.c
+++ b/src/lib/16_in.c
@@ -1298,9 +1298,9 @@ byte      IN_MouseButtons (global_game_variables_t *gvar)
 ===================\r
 */\r
 \r
-byte   IN_JoyButtons (void)\r
+word   IN_JoyButtons (void)\r
 {\r
-       byte joybits;\r
+       word joybits;\r
 \r
        joybits = inportb(0x201);       // Get all the joystick buttons\r
        joybits >>= 4;                          // only the high bits are useful\r

diff --git a/src/lib/16_in.h b/src/lib/16_in.h
index 329788d1a758b624b563859a77f0182555b02cd4..e85b624aa963d056488e6d363c091aacf0552400 100755 (executable)
--- a/src/lib/16_in.h
+++ b/src/lib/16_in.h
@@ -242,7 +242,7 @@ extern      byte            *IN_GetScanName(ScanCode);
 \r
 \r
 byte   IN_MouseButtons (global_game_variables_t *gvar);\r
-byte   IN_JoyButtons (void);\r
+word   IN_JoyButtons (void);\r
 \r
 void INL_GetJoyDelta(word joy,int *dx,int *dy/*,boolean adaptive*/, global_game_variables_t *gvar);\r
 void IN_StartAck(global_game_variables_t *gvar);\r