fix duplicate start sounds

don't BeginFadingOut if the selected choice doesn't specify a screen
This commit is contained in:
Chris Danford
2005-01-08 09:50:59 +00:00
parent 58e31666da
commit 9415cea26a
5 changed files with 49 additions and 30 deletions
+16 -1
View File
@@ -594,7 +594,22 @@ void ScreenSelectMaster::MenuStart( PlayerNumber pn )
GameCommand &mc = m_aGameCommands[m_iChoice[pn]];
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo(ssprintf("%s comment %s",m_sName.c_str(), mc.m_sName.c_str())) );
m_soundStart.Play();
if( mc.m_sSoundPath.empty() )
m_soundStart.Play();
if( mc.m_sScreen.empty() )
{
mc.ApplyToAllPlayers();
return;
}
// If the player isn't already joined, join them.
MenuInput MenuI;
MenuI.player = pn;
MenuI.button = MENU_BUTTON_START;
Screen::JoinInput( MenuI );
float fSecs = 0;
bool bAllDone = true;