From 71c8f8b2b2168c0a67c79be84d8b061ac566fbb5 Mon Sep 17 00:00:00 2001 From: Josh Allen Date: Sun, 23 Mar 2008 22:21:21 +0000 Subject: [PATCH] Add a branch for use with the new theme and network play. Keep the old around for reference. --- stepmania/Themes/default/Scripts/Branches.lua | 7 +++++++ stepmania/Themes/default/metrics.ini | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index d596dc75d7..5b0ee44654 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -36,6 +36,13 @@ function SongSelectionScreen() return "ScreenSelectMusic" end +function ScreenSelectMusicBranch() + if IsNetConnected() then ReportStyle() end + if IsNetSMOnline() then return SMOnlineScreen() end + if IsNetConnected() then return "ScreenNetSelectMusic" end + return "ScreenSelectMusic" +end + function NextNetworkScreen() if IsNetConnected() then return "ScreenCaution" end return "ScreenTitleMenu" diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 127894b557..b8587762b8 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -235,7 +235,8 @@ UpdateOnMessage="" PrevScreen="ScreenTitleMenu" ChoiceNames="1,2,3,4,5" # The "name" here affects the announcer, eg. "ScreenSelectStyle comment single". -Choice1="playmode,regular;name,Normal;text,Normal;screen,ScreenSelectMusic" +#Choice1="playmode,regular;name,Normal;text,Normal;screen,ScreenSelectMusic" +Choice1="playmode,regular;name,Normal;text,Normal;screen,"..ScreenSelectMusicBranch() Choice2="playmode,nonstop;name,Nonstop;text,Nonstop;screen,ScreenSelectMusic" Choice3="playmode,oni;name,Challenge;text,Challenge;screen,ScreenSelectMusic" Choice4="playmode,nonstop;name,Survival;text,Survival;screen,ScreenSelectMusic" @@ -4442,4 +4443,4 @@ FrameX=0 FrameY=0 TextX= TextY= -TextOnCommand=zoom,0.5 \ No newline at end of file +TextOnCommand=zoom,0.5