From c38a1df84464a6eb837998edd47cc8a2a2a4dabf Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 20 Aug 2011 21:37:45 -0500 Subject: [PATCH] even more branch changes, but I think that's it from me on that --- Themes/_fallback/Scripts/02 Branches.lua | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index 24383497b2..94ec0d3ad8 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -81,12 +81,8 @@ Branch = { end, AfterSelectProfile = function() if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then - if IsNetConnected() then - -- use SelectStyle in online... - return "ScreenSelectStyle" - else - return "ScreenSelectPlayMode" - end + -- use SelectStyle in online... + return IsNetConnected() and "ScreenSelectStyle" or "ScreenSelectPlayMode" else return "ScreenSelectStyle" end @@ -105,11 +101,7 @@ Branch = { return "ScreenSelectPlayMode" end, AfterSelectStyle = function() - if CHARMAN:GetAllCharacters() ~= nil then - return "ScreenSelectCharacter" - else - return "ScreenGameInformation" - end + return CHARMAN:GetAllCharacters() ~= nil and "ScreenSelectCharacter" or "ScreenGameInformation" end, AfterProfileSave = function() -- Might be a little too broken? -- Midiman @@ -166,10 +158,7 @@ Branch = { end end, GameplayScreen = function() - if IsRoutine() then - return "ScreenGameplayShared" - end - return "ScreenGameplay" + return IsRoutine() and "ScreenGameplayShared" or "ScreenGameplay" end, AfterGameplay = function() -- pick an evaluation screen based on settings.