From f5d89976ea8772f1e75569de0dc21479baf03f82 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 7 Jan 2011 22:15:29 -0600 Subject: [PATCH] Make routine mode use ScreenGameplayShared instead of ScreenGameplay --- Themes/_fallback/Scripts/02 Branches.lua | 11 +++++++++++ Themes/_fallback/metrics.ini | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index af4e7f1117..476ab1b977 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -26,6 +26,11 @@ function SelectMusicOrCourse() end end +-- functions used for Routine mode +function IsRoutine() + return GAMESTATE:GetCurrentStyle() and GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides"; +end + Branch = { Init = function() if GAMESTATE:GetCoinMode() == 'CoinMode_Home' then @@ -155,6 +160,12 @@ Branch = { return "ScreenStageInformation" end end, + GameplayScreen = function() + if IsRoutine() then + return "ScreenGameplayShared" + end + return "ScreenGameplay" + end AfterGameplay = function() -- pick an evaluation screen based on settings. if IsNetSMOnline() then diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index f51adbe98e..a2051e52b4 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1957,7 +1957,7 @@ Fallback="StepsDisplay" Class="ScreenSplash" Fallback="ScreenSplash" # -NextScreen="ScreenGameplay" +NextScreen=Branch.GameplayScreen() PrevScreen=Branch.BackOutOfStageInformation() PrepareScreen="ScreenGameplay" #