Don't play the Start sound in SM_BeginFadingOut. It might

have been triggered by something that just played a sound,
or the screen might want to play a different sound.  It's
not SM_BeginFadingOut's job to play a sound.

(fixes double-start sound when "next screen" options are
selected from context menus in ScreenOptionsManage*)
This commit is contained in:
Glenn Maynard
2006-01-30 05:41:46 +00:00
parent 37338dd78a
commit 5995043bf0
7 changed files with 8 additions and 2 deletions
+1 -2
View File
@@ -567,8 +567,6 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
}
StartTransitioningScreen( SM_ExportOptions );
SCREENMAN->PlayStartSound();
}
else if( SM == SM_ExportOptions )
{
@@ -877,6 +875,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
if( bEndThisScreen )
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
return;
}
@@ -269,6 +269,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
}
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else // a course entry
@@ -456,6 +456,7 @@ void ScreenOptionsEditCourseEntry::ProcessMenuStart( const InputEventPlus &input
break;
case ROW_SET_MODS:
case ROW_DONE:
SCREENMAN->PlayStartSound();
ScreenOptions::BeginFadingOut();
break;
}
@@ -373,6 +373,7 @@ void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input )
}
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else // a course
@@ -249,10 +249,12 @@ void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input
ScreenPrompt::Prompt( SM_None, s );
return;
}
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else if( m_pRows[iCurRow]->GetRowType() == OptionRow::RowType_Exit )
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else // a Steps
@@ -322,6 +322,7 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input
}
else if( row.GetRowType() == OptionRow::RowType_Exit )
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else // a profile
@@ -127,6 +127,7 @@ void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
bool bSuccess = MEMCARDMAN->MountCard( PLAYER_1, dev );
if( bSuccess )
{
SCREENMAN->PlayStartSound();
this->BeginFadingOut();
}
else