From 8658b101cccbfd18abaf13a1ca45eaf4d53c0c76 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 26 Aug 2002 04:46:16 +0000
Subject: [PATCH] Don't export PumpButtonNames; compact the header a bit.

---
 stepmania/src/RageInput.cpp |  2 +-
 stepmania/src/RageInput.h   | 36 +++++-------------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp
index 8cbf6fdc5f..f76ec71d2f 100644
--- a/stepmania/src/RageInput.cpp
+++ b/stepmania/src/RageInput.cpp
@@ -36,7 +36,7 @@
 
 RageInput*		INPUTMAN	= NULL;		// globally accessable input device
 
-const char *PumpButtonNames[] = {
+static const char *PumpButtonNames[] = {
 	"UL", "UR", "MID", "DL", "DR", "Esc",
 	"P2 UL", "P2 UR", "P2 MID", "P2 DL", "P2 DR"
 };
diff --git a/stepmania/src/RageInput.h b/stepmania/src/RageInput.h
index b5c60051c6..39139b428c 100644
--- a/stepmania/src/RageInput.h
+++ b/stepmania/src/RageInput.h
@@ -36,42 +36,16 @@ enum InputDevice {
 
 // button byte codes for directional pad
 enum JoystickButton {
-	JOY_LEFT = 0,
-	JOY_RIGHT,
-	JOY_UP,
-	JOY_DOWN,
-	JOY_1,
-	JOY_2,
-	JOY_3,
-	JOY_4,
-	JOY_5,
-	JOY_6,
-	JOY_7,
-	JOY_8,
-	JOY_9,
-	JOY_10,
-	JOY_11,
-	JOY_12,
-	JOY_13,
-	JOY_14,
-	JOY_15,
-	JOY_16,
-	JOY_17,
-	JOY_18,
-	JOY_19,
-	JOY_20,
-	JOY_21,
-	JOY_22,
-	JOY_23,
-	JOY_24,
+	JOY_LEFT = 0, JOY_RIGHT, JOY_UP, JOY_DOWN,
+	JOY_1,	JOY_2,	JOY_3,	JOY_4,	JOY_5,	JOY_6,	JOY_7,	JOY_8,	JOY_9,	JOY_10,
+	JOY_11,	JOY_12,	JOY_13,	JOY_14,	JOY_15,	JOY_16,	JOY_17,	JOY_18,	JOY_19,	JOY_20,
+	JOY_21,	JOY_22,	JOY_23,	JOY_24,
 	NUM_JOYSTICK_BUTTONS	// leave this at the end
 };
 
 const int NUM_DEVICE_BUTTONS = MAX( MAX( NUM_KEYBOARD_BUTTONS, NUM_JOYSTICK_BUTTONS ), 
 								NUM_PUMP_PAD_BUTTONS );
 
-extern const char *PumpButtonNames[];
-
 struct DeviceInput
 {
 public:
@@ -164,7 +138,7 @@ public:
 	// Initialize DirectInput Resources
 	HRESULT Initialize();
 	// Release all DirectInput Resources
-	VOID Release();
+	void Release();
 	// Get our Devices State
 	HRESULT Update();
 	bool IsBeingPressed( DeviceInput di );