From 14fbedd1b24b8201d01a86c731ebb7d571125319 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 17 Mar 2007 23:05:34 +0000 Subject: [PATCH] GetNumStagesForSongAndStyle -> GetNumStagesForSongAndStyleType --- stepmania/src/GameState.cpp | 10 +++++----- stepmania/src/GameState.h | 2 +- stepmania/src/SongUtil.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 3a2bd7a213..dc9836ad45 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -529,14 +529,14 @@ int GameState::GetNumStagesMultiplierForSong( const Song* pSong ) return iNumStages; } -int GameState::GetNumStagesForSongAndStyle( const Song* pSong, const Style *pStyle ) +int GameState::GetNumStagesForSongAndStyleType( const Song* pSong, StyleType st ) { int iNumStages = GetNumStagesMultiplierForSong( pSong ); // One player, two-sides styles cost extra - switch( pStyle->m_StyleType ) + switch( st ) { - DEFAULT_FAIL( pStyle->m_StyleType ); + DEFAULT_FAIL( st ); case StyleType_OnePlayerTwoSides: if( g_Premium == Premium_Off ) iNumStages *= 2; @@ -555,7 +555,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() int iNumStagesOfThisSong = 1; if( GAMESTATE->m_pCurSong ) { - Steps *pSteps = GAMESTATE->m_pCurSteps[GAMESTATE->m_MasterPlayerNumber]; + const Steps *pSteps = GAMESTATE->m_pCurSteps[GAMESTATE->m_MasterPlayerNumber]; StepsType st; if( pSteps ) { @@ -570,7 +570,7 @@ int GameState::GetNumStagesForCurrentSongAndStepsOrCourse() st = pStyle->m_StepsType; } const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumSidesJoined(), st ); - iNumStagesOfThisSong = GameState::GetNumStagesForSongAndStyle( GAMESTATE->m_pCurSong, pStyle ); + iNumStagesOfThisSong = GameState::GetNumStagesForSongAndStyleType( GAMESTATE->m_pCurSong, pStyle->m_StyleType ); } else if( GAMESTATE->m_pCurCourse ) iNumStagesOfThisSong = 1; diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 61f3cb0a3c..6a8887d75a 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -119,7 +119,7 @@ public: int m_iCurrentStageIndex; static int GetNumStagesMultiplierForSong( const Song* pSong ); - static int GetNumStagesForSongAndStyle( const Song* pSong, const Style *pStyle ); + static int GetNumStagesForSongAndStyleType( const Song* pSong, StyleType st ); static int GetNumStagesForCurrentSongAndStepsOrCourse(); int GetStageIndex() const; diff --git a/stepmania/src/SongUtil.cpp b/stepmania/src/SongUtil.cpp index 9aa5ca4c68..473c63fc8a 100644 --- a/stepmania/src/SongUtil.cpp +++ b/stepmania/src/SongUtil.cpp @@ -832,7 +832,7 @@ static void GetPlayableStepsTypes( const Song *pSong, set &vOut ) bool bShowThisStepsType = find( vstToShow.begin(), vstToShow.end(), *st ) != vstToShow.end(); const Style *pStyle = GAMEMAN->GetFirstCompatibleStyle( GAMESTATE->m_pCurGame, GAMESTATE->GetNumPlayersEnabled(), *st ); - bool bEnoughStages = GAMESTATE->GetNumStagesLeft() >= GAMESTATE->GetNumStagesForSongAndStyle(pSong,pStyle); + bool bEnoughStages = GAMESTATE->GetNumStagesLeft() >= GAMESTATE->GetNumStagesForSongAndStyleType(pSong, pStyle->m_StyleType); if( bShowThisStepsType && bEnoughStages ) vOut.insert( *st );