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

JOY_1 -> JOY_BUTTON_1

Browse Source
This commit is contained in:
Ben Anderson
2005-09-21 21:09:27 +00:00
parent ec97b839e2
commit 622293b6eb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void InputHandler_Linux_Joystick::Update(float fDeltaTime)
// In 2.6.11 using an EMS USB2, the event number for P1 Tri (the first button) // In 2.6.11 using an EMS USB2, the event number for P1 Tri (the first button)
// is being reported as 32 instead of 0. Correct for this. // is being reported as 32 instead of 0. Correct for this.
wrap( iNum, 32 ); // max number of joystick buttons. Make this a constant? wrap( iNum, 32 ); // max number of joystick buttons. Make this a constant?
ButtonPressed(DeviceInput(id, JOY_1 + iNum), event.value); ButtonPressed(DeviceInput(id, JOY_BUTTON_1 + iNum), event.value);
break; break;
} }
stepmania/src/arch/InputHandler/InputHandler_SDL.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void InputHandler_SDL::Update(float fDeltaTime)
case SDL_JOYBUTTONUP: case SDL_JOYBUTTONUP:
{ {
InputDevice i = InputDevice(DEVICE_JOY1 + event.jbutton.which); InputDevice i = InputDevice(DEVICE_JOY1 + event.jbutton.which);
JoystickButton Button = JoystickButton(JOY_1 + event.jbutton.button); JoystickButton Button = JoystickButton(JOY_BUTTON_1 + event.jbutton.button);
if(Button >= NUM_JOYSTICK_BUTTONS) if(Button >= NUM_JOYSTICK_BUTTONS)
{ {
LOG->Warn("Ignored joystick event (button too high)"); LOG->Warn("Ignored joystick event (button too high)");