From a6cd1ace09f2b6a79b0dbe19ce787b422b2f04e6 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Sun, 6 Aug 2006 02:56:56 +0000 Subject: [PATCH] Simplify. --- stepmania/Themes/default/Scripts/Branches.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index 0ca816a6f0..af839df3f5 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -58,6 +58,8 @@ function ScreenPlayerOptionsNext() end function GetGameplayScreen() + local st = GAMESTATE:GetCurrentStyleType() + if st == "TwoPlayersSharedSides" then return "ScreenGameplayShared" end return "ScreenGameplay" end @@ -86,7 +88,7 @@ function GetEvaluationNextScreen( sNextScreen, sFailedScreen, sEndScreen ) return sNextScreen end - local bIsExtraStage = GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() + local bIsExtraStage = GAMESTATE:IsAnExtraStage() -- Not in event mode. If failed, go to the game over screen. if STATSMAN:GetCurStageStats():AllFailed() and not bIsExtraStage then Trace( "Failed" ) @@ -191,7 +193,7 @@ function GetScreenInstructions() end function OptionsMenuAvailable() - if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then return false end + if GAMESTATE:IsAnExtraStage() then return false end return true end