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

Clean up

Browse Source
This commit is contained in:
Ryan Dortmans
2004-09-28 06:08:33 +00:00
parent 8fc33017f0
commit 232cf294ea
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
+3 -6
View File
@@ -88,10 +88,7 @@ void InputHandler_Xbox::Update(float fDeltaTime)
for(unsigned i = 0; i < NUM_JOYSTICKS; i++)
{
if(joysticks[i] == 0)
{
LOG->Trace("Ignoring absent joystick");
continue;
}
InputDevice inputDevice = InputDevice(DEVICE_JOY1 + i);
XINPUT_STATE xis;
@@ -99,7 +96,7 @@ void InputHandler_Xbox::Update(float fDeltaTime)
XInputGetState( joysticks[i], &xis );
// check buttons
for(int j = 0; j < NUM_BUTTONS; j++)
for(int j = 0; j < ARRAYSIZE(buttonMasks); j++)
{
DWORD nowPressed = xis.Gamepad.wButtons & buttonMasks[j];
DWORD wasPressed = lastState[i].wButtons & buttonMasks[j];
@@ -119,7 +116,7 @@ void InputHandler_Xbox::Update(float fDeltaTime)
}
// check analog buttons
for(int j = 0; j < NUM_ANALOG_BUTTONS; j++)
for(int j = 0; j < ARRAYSIZE(xis.Gamepad.bAnalogButtons); j++)
{
bool nowPressed = xis.Gamepad.bAnalogButtons[j] > XINPUT_GAMEPAD_MAX_CROSSTALK;
bool wasPressed = lastState[i].bAnalogButtons[j] > XINPUT_GAMEPAD_MAX_CROSSTALK;
@@ -141,7 +138,7 @@ void InputHandler_Xbox::Update(float fDeltaTime)
// check thumbsticks
SHORT axes[] = { xis.Gamepad.sThumbLX, xis.Gamepad.sThumbLY, xis.Gamepad.sThumbRX, xis.Gamepad.sThumbRY};
for(int j = 0; j < NUM_AXES; j++)
for(int j = 0; j < ARRAYSIZE(axes); j++)
{
if(axes[j] != 0)
{
stepmania/src/arch/InputHandler/InputHandler_Xbox.h
-4
View File
@@ -6,10 +6,6 @@
#include <xtl.h>
#define NUM_PORTS 4
#define NUM_JOYSTICKS 2
#define NUM_BUTTONS 8
#define NUM_ANALOG_BUTTONS 8
#define NUM_AXES 4
class InputHandler_Xbox: public InputHandler
{