actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stage enum name case cleanup

Browse Source
This commit is contained in:
Chris Danford
2008-03-29 11:41:16 +00:00
parent 4e5eb8f3c1
commit 33d8a5fbf4
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.h
+8 -8
View File
@@ -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,
};
stepmania/src/GameState.cpp
+8 -8
View File
@@ -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
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -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 );
stepmania/src/ScreenWithMenuElements.h
+1 -1
View File
@@ -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;
stepmania/src/StatsManager.cpp
+2 -2
View File
@@ -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;