Extra stage forces mods, don't allow ScreenPlayerOptions.

This commit is contained in:
Steve Checkoway
2006-08-07 01:18:42 +00:00
parent fe4db99560
commit ca130e9cd3
+5 -2
View File
@@ -717,7 +717,8 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
input.MenuI.button == MENU_BUTTON_START && input.MenuI.button == MENU_BUTTON_START &&
input.type != IET_RELEASE && input.type != IET_RELEASE &&
input.type != IET_LEVEL_CHANGED && input.type != IET_LEVEL_CHANGED &&
OPTIONS_MENU_AVAILABLE.GetValue() ) OPTIONS_MENU_AVAILABLE.GetValue() &&
!GAMESTATE->IsAnExtraStage() )
{ {
if( m_bGoToOptions ) if( m_bGoToOptions )
return; /* got it already */ return; /* got it already */
@@ -726,7 +727,9 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
if( !m_bAllowOptionsMenuRepeat && if( !m_bAllowOptionsMenuRepeat &&
(input.type == IET_SLOW_REPEAT || input.type == IET_FAST_REPEAT )) (input.type == IET_SLOW_REPEAT || input.type == IET_FAST_REPEAT ))
{
return; /* not allowed yet */ return; /* not allowed yet */
}
m_bGoToOptions = true; m_bGoToOptions = true;
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
@@ -1219,7 +1222,7 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
{ {
SCREENMAN->PlayStartSound(); SCREENMAN->PlayStartSound();
if( OPTIONS_MENU_AVAILABLE ) if( OPTIONS_MENU_AVAILABLE && !GAMESTATE->IsAnExtraStage() )
{ {
// show "hold START for options" // show "hold START for options"
this->PlayCommand( "ShowPressStartForOptions" ); this->PlayCommand( "ShowPressStartForOptions" );