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

Trigger "select music comment repeat" announcer if the same song is

Browse Source 
played more than once.
This commit is contained in:
Glenn Maynard
2003-09-06 01:57:24 +00:00
parent c7358e2cf9
commit fbe8045e3a
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+17 -2
View File
@@ -761,7 +761,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
switch( m_MusicWheel.GetSelectedType() ) switch( m_MusicWheel.GetSelectedType() )
{ {
case TYPE_SONG: { case TYPE_SONG: {
bool bIsNew = m_MusicWheel.GetSelectedSong()->IsNew(); const bool bIsNew = m_MusicWheel.GetSelectedSong()->IsNew();
bool bIsHard = false; bool bIsHard = false;
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
{ {
@@ -771,7 +771,22 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
bIsHard = true; bIsHard = true;
} }
if( bIsNew ) /* See if this song is a repeat. If we're in event mode, only check the last five songs. */
bool bIsRepeat = false;
int i = 0;
if( PREFSMAN->m_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") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment new") );
else if( bIsHard ) else if( bIsHard )
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("select music comment hard") );