From 6b0392468134d5329dabd33cd1b931066ad6a02a Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 27 Sep 2006 04:37:01 +0000
Subject: [PATCH] NUM_EditButton, EditButton_Invalid

---
 stepmania/src/ScreenEdit.cpp | 26 +++++++++++++-------------
 stepmania/src/ScreenEdit.h   | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index d0cbbff3a0..c5577db165 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -344,7 +344,7 @@ EditButton ScreenEdit::DeviceToEdit( const DeviceInput &DeviceI ) const
 		}
 	}
 
-	return EDIT_BUTTON_INVALID;
+	return EditButton_Invalid;
 }
 
 /* Given a DeviceInput that was just depressed, return an active edit function. */
@@ -364,7 +364,7 @@ EditButton ScreenEdit::MenuButtonToEditButton( MenuButton MenuI ) const
 		}
 	}
 
-	return EDIT_BUTTON_INVALID;
+	return EditButton_Invalid;
 }
 
 /* If DeviceI was just pressed, return true if button is triggered.  (More than one
@@ -1075,7 +1075,7 @@ void ScreenEdit::Input( const InputEventPlus &input )
 		return;
 
 	EditButton EditB = DeviceToEdit( input.DeviceI );
-	if( EditB == EDIT_BUTTON_INVALID )
+	if( EditB == EditButton_Invalid )
 		EditB = MenuButtonToEditButton( input.MenuI );
 		
 
@@ -3539,18 +3539,18 @@ struct EditHelpLine
 	EditHelpLine( 
 		const char *_szEnglishDescription,
 		EditButton eb0, 
-		EditButton eb1 = EDIT_BUTTON_INVALID, 
-		EditButton eb2 = EDIT_BUTTON_INVALID, 
-		EditButton eb3 = EDIT_BUTTON_INVALID, 
-		EditButton eb4 = EDIT_BUTTON_INVALID, 
-		EditButton eb5 = EDIT_BUTTON_INVALID, 
-		EditButton eb6 = EDIT_BUTTON_INVALID, 
-		EditButton eb7 = EDIT_BUTTON_INVALID, 
-		EditButton eb8 = EDIT_BUTTON_INVALID, 
-		EditButton eb9 = EDIT_BUTTON_INVALID )
+		EditButton eb1 = EditButton_Invalid, 
+		EditButton eb2 = EditButton_Invalid, 
+		EditButton eb3 = EditButton_Invalid, 
+		EditButton eb4 = EditButton_Invalid, 
+		EditButton eb5 = EditButton_Invalid, 
+		EditButton eb6 = EditButton_Invalid, 
+		EditButton eb7 = EditButton_Invalid, 
+		EditButton eb8 = EditButton_Invalid, 
+		EditButton eb9 = EditButton_Invalid )
 	{
 		szEnglishDescription = _szEnglishDescription;
-#define PUSH_IF_VALID( x ) if( x != EDIT_BUTTON_INVALID ) veb.push_back( x );
+#define PUSH_IF_VALID( x ) if( x != EditButton_Invalid ) veb.push_back( x );
 		PUSH_IF_VALID( eb0 );
 		PUSH_IF_VALID( eb1 );
 		PUSH_IF_VALID( eb2 ); 
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index cad0cb49ea..b8dae8a96c 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -122,10 +122,10 @@ enum EditButton
 	
 	EDIT_BUTTON_SWITCH_PLAYERS,
 
-	NUM_EDIT_BUTTONS,		// leave this at the end
-	EDIT_BUTTON_INVALID
+	NUM_EditButton,		// leave this at the end
+	EditButton_Invalid
 };
-#define FOREACH_EditButton( e ) FOREACH_ENUM( EditButton, NUM_EDIT_BUTTONS, e )
+#define FOREACH_EditButton( e ) FOREACH_ENUM( EditButton, NUM_EditButton, e )
 const int NUM_EDIT_TO_DEVICE_SLOTS = 2;
 const int NUM_EDIT_TO_MENU_SLOTS = 2;
 
@@ -137,8 +137,8 @@ const int NUM_EDIT_TO_MENU_SLOTS = 2;
  */
 struct MapEditToDI
 {
-	DeviceInput button[NUM_EDIT_BUTTONS][NUM_EDIT_TO_DEVICE_SLOTS];
-	DeviceInput hold[NUM_EDIT_BUTTONS][NUM_EDIT_TO_DEVICE_SLOTS];
+	DeviceInput button[NUM_EditButton][NUM_EDIT_TO_DEVICE_SLOTS];
+	DeviceInput hold[NUM_EditButton][NUM_EDIT_TO_DEVICE_SLOTS];
 	void Clear()
 	{
 		FOREACH_EditButton(e)
@@ -153,7 +153,7 @@ struct MapEditToDI
 // Like MapEditToDI, but maps MenuButton instead of DeviceInput.
 struct MapEditButtonToMenuButton
 {
-	MenuButton button[NUM_EDIT_BUTTONS][NUM_EDIT_TO_MENU_SLOTS];
+	MenuButton button[NUM_EditButton][NUM_EDIT_TO_MENU_SLOTS];
 	void Clear()
 	{
 		FOREACH_EditButton(e)