From 743421f88f667e3b32a1d58f11f18d9b8c93faab Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 10 May 2007 17:59:13 +0000
Subject: [PATCH] some MENU -> GAME

---
 stepmania/src/Screen.cpp         | 16 ++++++++--------
 stepmania/src/ScreenAttract.cpp  |  8 ++++----
 stepmania/src/ScreenContinue.cpp |  2 +-
 stepmania/src/ScreenSelect.cpp   |  2 +-
 stepmania/src/StepMania.cpp      |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/stepmania/src/Screen.cpp b/stepmania/src/Screen.cpp
index 83d71422a4..d1ed410f08 100644
--- a/stepmania/src/Screen.cpp
+++ b/stepmania/src/Screen.cpp
@@ -186,18 +186,18 @@ void Screen::Input( const InputEventPlus &input )
 	// default input handler used by most menus
 	switch( input.MenuI )
 	{
-	case MENU_BUTTON_UP:	this->MenuUp	( input );	return;
-	case MENU_BUTTON_DOWN:	this->MenuDown	( input );	return;
-	case MENU_BUTTON_LEFT:	this->MenuLeft	( input );	return;
-	case MENU_BUTTON_RIGHT:	this->MenuRight	( input );	return;
-	case MENU_BUTTON_BACK:	
+	case GAME_BUTTON_MENUUP:	this->MenuUp	( input );	return;
+	case GAME_BUTTON_MENUDOWN:	this->MenuDown	( input );	return;
+	case GAME_BUTTON_MENULEFT:	this->MenuLeft	( input );	return;
+	case GAME_BUTTON_MENURIGHT:	this->MenuRight	( input );	return;
+	case GAME_BUTTON_BACK:	
 		/* Don't make the user hold the back button if they're pressing escape and escape is the back button. */
 		if( !PREFSMAN->m_bDelayedBack || input.type==IET_REPEAT || (input.DeviceI.device == DEVICE_KEYBOARD && input.DeviceI.button == KEY_ESC) )
 			this->MenuBack( input );
 		return;
-	case MENU_BUTTON_START:	this->MenuStart	( input );	return;
-	case MENU_BUTTON_SELECT:this->MenuSelect( input );	return;
-	case MENU_BUTTON_COIN:	this->MenuCoin	( input );	return;
+	case GAME_BUTTON_START:	this->MenuStart	( input );	return;
+	case GAME_BUTTON_SELECT:this->MenuSelect( input );	return;
+	case GAME_BUTTON_COIN:	this->MenuCoin	( input );	return;
 	}
 }
 
diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index b9fbd6870c..2715e05dfd 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -55,12 +55,12 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 
 	switch( input.MenuI )
 	{
-	case MENU_BUTTON_BACK:
+	case GAME_BUTTON_BACK:
 		if( !(bool)BACK_GOES_TO_START_SCREEN )
 			break;
 		// fall through
-	case MENU_BUTTON_START:
-	case MENU_BUTTON_COIN:
+	case GAME_BUTTON_START:
+	case GAME_BUTTON_COIN:
 		switch( GAMESTATE->GetCoinMode() )
 		{
 		case CoinMode_Pay:
@@ -76,7 +76,7 @@ void ScreenAttract::AttractInput( const InputEventPlus &input, ScreenWithMenuEle
 			LOG->Trace("ScreenAttract::AttractInput: begin fading to START_SCREEN" );
 
 			/* HandleGlobalInputs() already played the coin sound.  Don't play it again. */
-			if( input.MenuI != MENU_BUTTON_COIN )
+			if( input.MenuI != GAME_BUTTON_COIN )
 				SCREENMAN->PlayStartSound();
 			
 			SetAttractVolume( false ); // unmute attract sounds
diff --git a/stepmania/src/ScreenContinue.cpp b/stepmania/src/ScreenContinue.cpp
index 631fd1da7b..1a5e2aba58 100644
--- a/stepmania/src/ScreenContinue.cpp
+++ b/stepmania/src/ScreenContinue.cpp
@@ -27,7 +27,7 @@ void ScreenContinue::BeginScreen()
 
 void ScreenContinue::Input( const InputEventPlus &input )
 {
-	if( input.MenuI == MENU_BUTTON_COIN &&  input.type == IET_FIRST_PRESS )
+	if( input.MenuI == GAME_BUTTON_COIN &&  input.type == IET_FIRST_PRESS )
 		ResetTimer();
 
 	if( input.MenuI == MENU_BUTTON_START  &&  input.type == IET_FIRST_PRESS  &&  GAMESTATE->JoinInput(input.pn) )
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index ee1757e0b3..c9d07c7dca 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -111,7 +111,7 @@ void ScreenSelect::Input( const InputEventPlus &input )
 	m_timerIdleTimeout.GetDeltaTime();
 
 	/* Choices may change when more coins are inserted. */
-	if( input.MenuI == MENU_BUTTON_COIN && input.type == IET_FIRST_PRESS )
+	if( input.MenuI == GAME_BUTTON_COIN && input.type == IET_FIRST_PRESS )
 		this->UpdateSelectableChoices();
 
 	if( input.MenuI == MENU_BUTTON_START && input.type == IET_FIRST_PRESS && GAMESTATE->JoinInput(input.pn) )
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 3d040a3c4a..f0e64db84d 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -1223,7 +1223,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 
 	switch( input.MenuI )
 	{
-	case MENU_BUTTON_OPERATOR:
+	case GAME_BUTTON_OPERATOR:
 
 		/* Global operator key, to get quick access to the options menu. Don't
 		 * do this if we're on a "system menu", which includes the editor
@@ -1237,7 +1237,7 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 		}
 		return true;
 
-	case MENU_BUTTON_COIN:
+	case GAME_BUTTON_COIN:
 		/* Handle a coin insertion. */
 		if( GAMESTATE->IsEditing() )	// no coins while editing
 		{