From 33d8a5fbf4ba7f23750f29a8980116450e55f1fc Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sat, 29 Mar 2008 11:41:16 +0000
Subject: [PATCH] Stage enum name case cleanup

---
 stepmania/src/GameConstantsAndTypes.h  | 16 ++++++++--------
 stepmania/src/GameState.cpp            | 16 ++++++++--------
 stepmania/src/ScreenEvaluation.cpp     |  2 +-
 stepmania/src/ScreenWithMenuElements.h |  2 +-
 stepmania/src/StatsManager.cpp         |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index bd02a9735b..7d46df0d62 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -457,14 +457,14 @@ LuaDeclareType( EditMode );
 
 enum Stage
 {
-	STAGE_NORMAL,
-	STAGE_EXTRA1,
-	STAGE_EXTRA2,
-	STAGE_NONSTOP,
-	STAGE_ONI,
-	STAGE_ENDLESS,
-	STAGE_EVENT,
-	STAGE_DEMO,
+	Stage_Normal,
+	Stage_Extra1,
+	Stage_Extra2,
+	Stage_Nonstop,
+	Stage_Oni,
+	Stage_Endless,
+	Stage_Event,
+	Stage_Demo,
 	NUM_Stage,
 	Stage_Invalid,
 };
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 8ce5d8f72c..55992a473b 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -934,15 +934,15 @@ bool GameState::IsExtraStage2() const
 
 Stage GameState::GetCurrentStage() const
 {
-	if( m_bDemonstrationOrJukebox )			return STAGE_DEMO;
+	if( m_bDemonstrationOrJukebox )			return Stage_Demo;
 	// "event" has precedence
-	else if( IsEventMode() )			return STAGE_EVENT;
-	else if( m_PlayMode == PLAY_MODE_ONI )		return STAGE_ONI;
-	else if( m_PlayMode == PLAY_MODE_NONSTOP )	return STAGE_NONSTOP;
-	else if( m_PlayMode == PLAY_MODE_ENDLESS )	return STAGE_ENDLESS;
-	else if( IsExtraStage() )			return STAGE_EXTRA1;
-	else if( IsExtraStage2() )			return STAGE_EXTRA2;
-	else						return STAGE_NORMAL;
+	else if( IsEventMode() )			return Stage_Event;
+	else if( m_PlayMode == PLAY_MODE_ONI )		return Stage_Oni;
+	else if( m_PlayMode == PLAY_MODE_NONSTOP )	return Stage_Nonstop;
+	else if( m_PlayMode == PLAY_MODE_ENDLESS )	return Stage_Endless;
+	else if( IsExtraStage() )			return Stage_Extra1;
+	else if( IsExtraStage2() )			return Stage_Extra2;
+	else						return Stage_Normal;
 }
 
 int GameState::GetCourseSongIndex() const
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 0e930e4b77..d412352265 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -99,7 +99,7 @@ void ScreenEvaluation::Init()
 		GAMESTATE->SetCurrentStyle( GameManager::GameAndStringToStyle(GameManager::GetDefaultGame(),"versus") );
 		ss.m_playMode = GAMESTATE->m_PlayMode;
 		ss.m_pStyle = GAMESTATE->GetCurrentStyle();
-		ss.m_Stage = STAGE_NORMAL;
+		ss.m_Stage = Stage_Normal;
 		GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
 		GAMESTATE->m_pCurSong.Set( SONGMAN->GetRandomSong() );
 		ss.m_vpPlayedSongs.push_back( GAMESTATE->m_pCurSong );
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 60e7a8059d..4cd38a07e9 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -46,7 +46,7 @@ protected:
 
 	AutoActor			m_sprUnderlay;
 	AutoActor			m_autoHeader;
-	AutoActor			m_sprStage;
+	AutoActor			m_sprStageDisplay;
 	MemoryCardDisplay		*m_MemoryCardDisplay[NUM_PLAYERS];
 	MenuTimer			*m_MenuTimer;
 	AutoActor			m_autoFooter;
diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp
index 7e8c44a983..05784a9774 100644
--- a/stepmania/src/StatsManager.cpp
+++ b/stepmania/src/StatsManager.cpp
@@ -95,7 +95,7 @@ void StatsManager::GetFinalEvalStageStats( StageStats& statsOut ) const
 		if( !ss.OnePassed() )
 			continue;
 
-		if( ss.m_Stage != STAGE_EXTRA1 && ss.m_Stage != STAGE_EXTRA2 )
+		if( ss.m_Stage != Stage_Extra1 && ss.m_Stage != Stage_Extra2 )
 		{
 			if( PassedRegularSongsLeft == 0 )
 				break;
@@ -139,7 +139,7 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum
 	
 	pProfile->m_iTotalDancePoints += ss.m_player[pn].m_iActualDancePoints;
 
-	if( ss.m_Stage == STAGE_EXTRA1 || ss.m_Stage == STAGE_EXTRA2 )
+	if( ss.m_Stage == Stage_Extra1 || ss.m_Stage == Stage_Extra2 )
 	{
 		if( ss.m_player[pn].m_bFailed )
 			++pProfile->m_iNumExtraStagesFailed;