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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-17 02:43:15 +00:00
parent 426173490d
commit 5a8bbef9c0
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+30 -30
View File
@@ -787,40 +787,40 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
ASSERT(0); ASSERT(0);
} }
if( m_bMadeChoice ) if( !m_bMadeChoice )
return;
SCREENMAN->PlayStartSound();
if( OPTIONS_MENU_AVAILABLE )
{ {
SCREENMAN->PlayStartSound(); // show "hold START for options"
this->PlayCommand( "ShowPressStartForOptions" );
if( OPTIONS_MENU_AVAILABLE ) m_bAllowOptionsMenu = true;
{ /* Don't accept a held START for a little while, so it's not
// show "hold START for options" * hit accidentally. Accept an initial START right away, though,
this->PlayCommand( "ShowPressStartForOptions" ); * so we don't ignore deliberate fast presses (which would be
* annoying). */
this->PostScreenMessage( SM_AllowOptionsMenuRepeat, 0.5f );
}
m_bAllowOptionsMenu = true; /* If we're currently waiting on song assets, abort all except the music and
/* Don't accept a held START for a little while, so it's not * start the music, so if we make a choice quickly before background requests
* hit accidentally. Accept an initial START right away, though, * come through, the music will still start. */
* so we don't ignore deliberate fast presses (which would be g_bCDTitleWaiting = g_bBannerWaiting = false;
* annoying). */ m_BackgroundLoader.Abort();
this->PostScreenMessage( SM_AllowOptionsMenuRepeat, 0.5f ); CheckBackgroundRequests( true );
}
/* If we're currently waiting on song assets, abort all except the music and if( OPTIONS_MENU_AVAILABLE )
* start the music, so if we make a choice quickly before background requests {
* come through, the music will still start. */ StartTransitioningScreen( SM_None );
g_bCDTitleWaiting = g_bBannerWaiting = false; float fTime = max( SHOW_OPTIONS_MESSAGE_SECONDS, this->GetTweenTimeLeft() );
m_BackgroundLoader.Abort(); this->PostScreenMessage( SM_BeginFadingOut, fTime );
CheckBackgroundRequests( true ); }
else
if( OPTIONS_MENU_AVAILABLE ) {
{ StartTransitioningScreen( SM_BeginFadingOut );
StartTransitioningScreen( SM_None );
float fTime = max( SHOW_OPTIONS_MESSAGE_SECONDS, this->GetTweenTimeLeft() );
this->PostScreenMessage( SM_BeginFadingOut, fTime );
}
else
{
StartTransitioningScreen( SM_BeginFadingOut );
}
} }
} }