From fbe8045e3a17a3b0f43923862cf9ca987d0505b8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 6 Sep 2003 01:57:24 +0000 Subject: [PATCH] Trigger "select music comment repeat" announcer if the same song is played more than once. --- stepmania/src/ScreenSelectMusic.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 42d1c1e63a..010cb79364 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -761,7 +761,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn ) switch( m_MusicWheel.GetSelectedType() ) { case TYPE_SONG: { - bool bIsNew = m_MusicWheel.GetSelectedSong()->IsNew(); + const bool bIsNew = m_MusicWheel.GetSelectedSong()->IsNew(); bool bIsHard = false; for( int p=0; pm_bEventMode ) + i = max( 0, int(GAMESTATE->m_vPlayedStageStats.size())-5 ); + for( ; i < (int)GAMESTATE->m_vPlayedStageStats.size(); ++i ) + if( GAMESTATE->m_vPlayedStageStats[i].pSong == m_MusicWheel.GetSelectedSong() ) + bIsRepeat = true; + + /* Don't complain about repeats if the user didn't get to pick. */ + if( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) + bIsRepeat = false; + + if( bIsRepeat ) + SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment repeat") ); + else if( bIsNew ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") ); else if( bIsHard ) SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") );