From 622293b6ebcf7f26b9ccf4481d2f8fafcf14a35c Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Wed, 21 Sep 2005 21:09:27 +0000 Subject: [PATCH] JOY_1 -> JOY_BUTTON_1 --- stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp | 2 +- stepmania/src/arch/InputHandler/InputHandler_SDL.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp index 90b9189c31..82760260e4 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp @@ -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) // is being reported as 32 instead of 0. Correct for this. 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; } diff --git a/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp b/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp index 6150f7576c..edbc4bd6ef 100644 --- a/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler_SDL.cpp @@ -210,7 +210,7 @@ void InputHandler_SDL::Update(float fDeltaTime) case SDL_JOYBUTTONUP: { 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) { LOG->Warn("Ignored joystick event (button too high)");