MenuButton -> GameButton

stepmania/src/InputEventPlus.h

@@ -13,13 +13,13 @@ class InputEventPlus
 public:
 	InputEventPlus():
 		type(IET_FIRST_PRESS),
-		MenuI(MenuButton_Invalid),
+		MenuI(GameButton_Invalid),
 		pn(PLAYER_INVALID),
 		mp(MultiPlayer_Invalid) { }
 	DeviceInput DeviceI;
 	GameInput GameI;
 	InputEventType type;
-	MenuButton MenuI;
+	GameButton MenuI;
 	PlayerNumber pn;
 	MultiPlayer mp;
 	DeviceInputList InputList;

stepmania/src/ScreenEdit.h

@@ -152,15 +152,15 @@ struct MapEditToDI
 	}
 };
 
-// Like MapEditToDI, but maps MenuButton instead of DeviceInput.
+// Like MapEditToDI, but maps GameButton instead of DeviceInput.
 struct MapEditButtonToMenuButton
 {
-	MenuButton button[NUM_EditButton][NUM_EDIT_TO_MENU_SLOTS];
+	GameButton button[NUM_EditButton][NUM_EDIT_TO_MENU_SLOTS];
 	void Clear()
 	{
 		FOREACH_EditButton(e)
 			for( int slot = 0; slot < NUM_EDIT_TO_MENU_SLOTS; ++slot )
-				button[e][slot] = MenuButton_Invalid;
+				button[e][slot] = GameButton_Invalid;
 	}
 };
 
@@ -465,7 +465,7 @@ public:
 
 	void InitEditMappings();
 	EditButton DeviceToEdit( const DeviceInput &DeviceI ) const;
-	EditButton MenuButtonToEditButton( MenuButton MenuI ) const;
+	EditButton MenuButtonToEditButton( GameButton MenuI ) const;
 	bool EditToDevice( EditButton button, int iSlotNum, DeviceInput &DeviceI ) const;
 	bool EditPressed( EditButton button, const DeviceInput &DeviceI );
 	bool EditIsBeingPressed( EditButton button ) const;

stepmania/src/ScreenMapControllers.cpp

@@ -102,7 +102,7 @@ void ScreenMapControllers::Init()
 			BitmapText *pSecondary = new BitmapText;
 			pSecondary->SetName( "Secondary" );
 			pSecondary->LoadFromFont( THEME->GetPathF("Common","title") );
-			MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( pKey->m_GameButton );
+			GameButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( pKey->m_GameButton );
 			RString sText;
 			if( mb != MenuButton_Invalid )
 				sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );

stepmania/src/ScreenNameEntry.cpp

@@ -278,7 +278,7 @@ void ScreenNameEntry::Init()
 
 			/* Find out if this column is associated with the START menu button. */
 			GameInput gi = GAMESTATE->GetCurrentStyle()->StyleInputToGameInput( iCol, p );
-			MenuButton mb = INPUTMAPPER->GameButtonToMenuButton( gi.button );
+			GameButton mb = INPUTMAPPER->GameButtonToMenuButton( gi.button );
 			if( mb == MENU_BUTTON_START )
 				continue;
 			m_ColToStringIndex[p][iCol] = CurrentStringIndex++;

stepmania/src/ScreenSelectMaster.h

@@ -101,7 +101,7 @@ protected:
 	int m_iChoice[NUM_PLAYERS];
 	bool m_bChosen[NUM_PLAYERS];
 
-	MenuButton m_TrackingRepeatingInput;
+	GameButton m_TrackingRepeatingInput;
 };
 
 

stepmania/src/ScreenTestInput.cpp

@@ -59,7 +59,7 @@ class InputList: public BitmapText
 
 				if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
 				{
-					MenuButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button );
+					GameButton mb = INPUTMAPPER->GetInputScheme()->GetMenuButtonSecondaryFunction( gi.button );
 					if( mb != MenuButton_Invalid )
 					{
 						RString sGameButtonString = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );