actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support 6 joysticks

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-11 00:16:32 +00:00
parent a7771a5c66
commit 9cf3f9b331
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageInputDevice.cpp
+4
View File
@@ -24,6 +24,8 @@ int DeviceInput::NumButtons(InputDevice device)
case DEVICE_JOY2:
case DEVICE_JOY3:
case DEVICE_JOY4:
case DEVICE_JOY5:
case DEVICE_JOY6:
return NUM_JOYSTICK_BUTTONS;
case DEVICE_PUMP1:
case DEVICE_PUMP2:
@@ -48,6 +50,8 @@ CString DeviceInput::GetDescription()
case DEVICE_JOY2:
case DEVICE_JOY3:
case DEVICE_JOY4:
case DEVICE_JOY5:
case DEVICE_JOY6:
sReturn = ssprintf("Joy%d ", device - DEVICE_JOY1 + 1 );
switch( button )
stepmania/src/RageInputDevice.h
+6 -2
View File
@@ -5,7 +5,7 @@
#include "RageTimer.h"
const int NUM_KEYBOARD_BUTTONS = SDLK_LAST;
const int NUM_JOYSTICKS = 4;
const int NUM_JOYSTICKS = 6;
const int NUM_JOYSTICK_HATS = 1;
const int NUM_PUMPS = 2;
@@ -15,6 +15,8 @@ enum InputDevice {
DEVICE_JOY2,
DEVICE_JOY3,
DEVICE_JOY4,
DEVICE_JOY5,
DEVICE_JOY6,
DEVICE_PUMP1,
DEVICE_PUMP2,
NUM_INPUT_DEVICES, // leave this at the end
@@ -62,6 +64,8 @@ const int NUM_DEVICE_BUTTONS[NUM_INPUT_DEVICES] =
NUM_JOYSTICK_BUTTONS, // DEVICE_JOY2
NUM_JOYSTICK_BUTTONS, // DEVICE_JOY3
NUM_JOYSTICK_BUTTONS, // DEVICE_JOY4
NUM_JOYSTICK_BUTTONS, // DEVICE_JOY5
NUM_JOYSTICK_BUTTONS, // DEVICE_JOY6
NUM_PUMP_PAD_BUTTONS, // DEVICE_PUMP1
NUM_PUMP_PAD_BUTTONS, // DEVICE_PUMP2
};
@@ -95,7 +99,7 @@ public:
char ToChar() const;
bool IsJoystick() const { return DEVICE_JOY1 <= device && device <= DEVICE_JOY4; }
bool IsJoystick() const { return DEVICE_JOY1 <= device && device < DEVICE_JOY1+NUM_JOYSTICKS; }
static int NumButtons(InputDevice device);
};