even more branch changes, but I think that's it from me on that

This commit is contained in:
AJ Kelly
2011-08-20 21:37:45 -05:00
parent b54946ce43
commit c38a1df844
+4 -15
View File
@@ -81,12 +81,8 @@ Branch = {
end, end,
AfterSelectProfile = function() AfterSelectProfile = function()
if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then if ( THEME:GetMetric("Common","AutoSetStyle") == true ) then
if IsNetConnected() then -- use SelectStyle in online...
-- use SelectStyle in online... return IsNetConnected() and "ScreenSelectStyle" or "ScreenSelectPlayMode"
return "ScreenSelectStyle"
else
return "ScreenSelectPlayMode"
end
else else
return "ScreenSelectStyle" return "ScreenSelectStyle"
end end
@@ -105,11 +101,7 @@ Branch = {
return "ScreenSelectPlayMode" return "ScreenSelectPlayMode"
end, end,
AfterSelectStyle = function() AfterSelectStyle = function()
if CHARMAN:GetAllCharacters() ~= nil then return CHARMAN:GetAllCharacters() ~= nil and "ScreenSelectCharacter" or "ScreenGameInformation"
return "ScreenSelectCharacter"
else
return "ScreenGameInformation"
end
end, end,
AfterProfileSave = function() AfterProfileSave = function()
-- Might be a little too broken? -- Midiman -- Might be a little too broken? -- Midiman
@@ -166,10 +158,7 @@ Branch = {
end end
end, end,
GameplayScreen = function() GameplayScreen = function()
if IsRoutine() then return IsRoutine() and "ScreenGameplayShared" or "ScreenGameplay"
return "ScreenGameplayShared"
end
return "ScreenGameplay"
end, end,
AfterGameplay = function() AfterGameplay = function()
-- pick an evaluation screen based on settings. -- pick an evaluation screen based on settings.