Simplify.

This commit is contained in:
Steve Checkoway
2006-08-06 02:37:42 +00:00
parent a89e8b9cb2
commit ba0d51cc7a
6 changed files with 14 additions and 14 deletions
+3 -3
View File
@@ -102,7 +102,7 @@ void MusicWheel::Load( RString sType )
m_soundChangeSort.Load( THEME->GetPathS(sType,"sort") );
m_soundExpand.Load( THEME->GetPathS(sType,"expand"), true );
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
// make the preferred group the group of the last song played.
if( GAMESTATE->m_sPreferredSongGroup == GROUP_ALL && !PREFSMAN->m_bPickExtraStage )
@@ -400,7 +400,7 @@ void MusicWheel::GetSongList(vector<Song*> &arraySongs, SortOrder so, const RStr
/* Hack: Add extra stage item if it was eliminated for any reason (eg. it's a long
* song). */
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
Song* pSong;
Steps* pSteps;
@@ -593,7 +593,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
arrayWheelItemDatas.push_back( WheelItemData(TYPE_PORTAL, NULL, "", NULL, RageColor(1,0,0,1)) );
}
if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
if( GAMESTATE->IsAnExtraStage() )
{
Song* pSong;
Steps* pSteps;