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:
@@ -567,8 +567,6 @@ void ScreenOptions::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
}
|
}
|
||||||
|
|
||||||
StartTransitioningScreen( SM_ExportOptions );
|
StartTransitioningScreen( SM_ExportOptions );
|
||||||
|
|
||||||
SCREENMAN->PlayStartSound();
|
|
||||||
}
|
}
|
||||||
else if( SM == SM_ExportOptions )
|
else if( SM == SM_ExportOptions )
|
||||||
{
|
{
|
||||||
@@ -877,6 +875,7 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
|
|||||||
|
|
||||||
if( bEndThisScreen )
|
if( bEndThisScreen )
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -269,6 +269,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
|
|||||||
}
|
}
|
||||||
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
|
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else // a course entry
|
else // a course entry
|
||||||
|
|||||||
@@ -456,6 +456,7 @@ void ScreenOptionsEditCourseEntry::ProcessMenuStart( const InputEventPlus &input
|
|||||||
break;
|
break;
|
||||||
case ROW_SET_MODS:
|
case ROW_SET_MODS:
|
||||||
case ROW_DONE:
|
case ROW_DONE:
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
ScreenOptions::BeginFadingOut();
|
ScreenOptions::BeginFadingOut();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -373,6 +373,7 @@ void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input )
|
|||||||
}
|
}
|
||||||
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
|
else if( iCurRow == (int)m_pRows.size()-1 ) // "done"
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else // a course
|
else // a course
|
||||||
|
|||||||
@@ -249,10 +249,12 @@ void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input
|
|||||||
ScreenPrompt::Prompt( SM_None, s );
|
ScreenPrompt::Prompt( SM_None, s );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else if( m_pRows[iCurRow]->GetRowType() == OptionRow::RowType_Exit )
|
else if( m_pRows[iCurRow]->GetRowType() == OptionRow::RowType_Exit )
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else // a Steps
|
else // a Steps
|
||||||
|
|||||||
@@ -322,6 +322,7 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input
|
|||||||
}
|
}
|
||||||
else if( row.GetRowType() == OptionRow::RowType_Exit )
|
else if( row.GetRowType() == OptionRow::RowType_Exit )
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else // a profile
|
else // a profile
|
||||||
|
|||||||
@@ -127,6 +127,7 @@ void ScreenOptionsMemoryCard::ProcessMenuStart( const InputEventPlus &input )
|
|||||||
bool bSuccess = MEMCARDMAN->MountCard( PLAYER_1, dev );
|
bool bSuccess = MEMCARDMAN->MountCard( PLAYER_1, dev );
|
||||||
if( bSuccess )
|
if( bSuccess )
|
||||||
{
|
{
|
||||||
|
SCREENMAN->PlayStartSound();
|
||||||
this->BeginFadingOut();
|
this->BeginFadingOut();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user