From 7e3622464a5cefc73ba59bc9c04f7b323f7a0c22 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Thu, 29 Jun 2006 01:11:10 +0000 Subject: [PATCH] Missed commit. --- stepmania/Themes/default/Scripts/Branches.lua | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index cc319e3043..0ca816a6f0 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -58,7 +58,6 @@ function ScreenPlayerOptionsNext() end function GetGameplayScreen() - if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then return "ScreenGameplay" end return "ScreenGameplay" end @@ -142,22 +141,22 @@ function GetGameplayNextScreen() Trace( " IsExtraStage2 = "..tostring(GAMESTATE:IsExtraStage2()) ) Trace( " Event mode = "..tostring(IsEventMode()) ) - if Passed or GAMESTATE:IsCourseMode() or - GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() or - GetTopScreenMetric( "ShowEvaluationOnFail" ) == "1" - then - Trace( "Go to evaluation screen" ) - return SelectEvaluationScreen() - end - - if IsEventMode() then - Trace( "Go to song selection screen" ) - -- DeletePreparedScreens() - return SongSelectionScreen() - end - - Trace( "ScreenGameOver" ) - return "ScreenGameOver" + return SelectEvaluationScreen() +-- if Passed or GAMESTATE:IsCourseMode() or +-- GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() +-- then +-- Trace( "Go to evaluation screen" ) +-- return SelectEvaluationScreen() +-- end +-- +-- if IsEventMode() then +-- Trace( "Go to song selection screen" ) +-- -- DeletePreparedScreens() +-- return SongSelectionScreen() +-- end +-- +-- Trace( "ScreenGameOver" ) +-- return "ScreenGameOver" end local function ShowScreenInstructions()