From 232cf294ea96ccfde295b82f86e36b5445f78802 Mon Sep 17 00:00:00 2001
From: Ryan Dortmans <tvstatic@users.sourceforge.net>
Date: Tue, 28 Sep 2004 06:08:33 +0000
Subject: [PATCH] Clean up

---
 stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp | 9 +++------
 stepmania/src/arch/InputHandler/InputHandler_Xbox.h   | 4 ----
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
index 77a069807f..b7b0512c0f 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
+++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.cpp
@@ -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)
 			{
diff --git a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
index 502c966417..9a10800f3b 100644
--- a/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
+++ b/stepmania/src/arch/InputHandler/InputHandler_Xbox.h
@@ -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
 {