From 65929a538c887340960c020e783ecb45936302a4 Mon Sep 17 00:00:00 2001
From: Charles Lohr <cnlohr@users.sourceforge.net>
Date: Wed, 12 Jan 2005 18:11:24 +0000
Subject: [PATCH] Update to utilize changed lua commands properly.

---
 stepmania/Themes/default/metrics.ini | 55 ++++++++++++++++++----------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index eedd637da9..991a95a75d 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -748,10 +748,31 @@ ScoreFrameP2OnCommand=hidden,1
 Fallback=ScreenSelectCourse
 DefaultSort=Endless
 
-[ScreenSMOnlineLogin]
+[ScreenSMOnlineLoginSet]
+Class=ScreenBranch
+Choices=1,2,3
+ //( IsPlayerEnabled(1) && not( IsSMOnlineLoggedIn(1) ) )
+Condition1= ( not IsSMOnlineLoggedIn(1) ) and ( IsPlayerEnabled(1) )
+ //( IsPlayerEnabled(2) && not( IsSMOnlineLoggedIn(2) ) )
+Condition2= ( not IsSMOnlineLoggedIn(2) ) and ( IsPlayerEnabled(2) )
+Condition3=true
+NextScreen1=screen,ScreenSMOnlineLogin1
+NextScreen2=screen,ScreenSMOnlineLogin2
+NextScreen3=screen,ScreenNetRoom
+
+[ScreenSMOnlineLogin1]
 PlayerNumber=1
+Class=ScreenSMOnlineLogin
+Fallback=ScreenSMOnlineLogin
+
+[ScreenSMOnlineLogin2]
+PlayerNumber=2
+Class=ScreenSMOnlineLogin
+Fallback=ScreenSMOnlineLogin
+
+[ScreenSMOnlineLogin]
 PasswordBG=
-NextScreen=ScreenNetRoom
+NextScreen=ScreenSMOnlineLoginSet
 PrevScreen=ScreenTitleBranch
 PasswordBGX=320
 PasswordBGY=260
@@ -1559,14 +1580,12 @@ PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0
 [ScreenBranchNetAfterEval]
 Class=ScreenBranch
 Choices=1,2,3,4
-Condition1=IsSMOnlineLoggedIn()
-Condition2=IsNetSMOnline()
-Condition3=IsNetConnected()
-Condition4=true
-NextScreen1=screen,ScreenSMOnlineSelectMusic
-NextScreen2=screen,ScreenSMOnlineLogin
-NextScreen3=screen,ScreenNetSelectMusic
-NextScreen4=screen,ScreenSelectMusic
+Condition1=IsNetSMOnline()
+Condition2=IsNetConnected()
+Condition3=true
+NextScreen1=screen,ScreenSMOnlineLoginSet
+NextScreen2=screen,ScreenNetSelectMusic
+NextScreen3=screen,ScreenSelectMusic
 
 [ScreenNetEvaluation]
 Class=ScreenNetEvaluation
@@ -3587,15 +3606,13 @@ NextScreen3=screen,ScreenSelectMusic
 
 [ScreenSelectBranchForNet]
 Class=ScreenBranch
-Choices=1,2,3,4
-Condition1=IsSMOnlineLoggedIn()
-Condition2=IsNetSMOnline()
-Condition3=IsNetConnected()
-Condition4=true
-NextScreen1=screen,ScreenNetRoom
-NextScreen2=screen,ScreenSMOnlineLogin
-NextScreen3=screen,ScreenNetSelectMusic
-NextScreen4=screen,ScreenSelectMusic
+Choices=1,2,3
+Condition1=IsNetSMOnline()
+Condition2=IsNetConnected()
+Condition3=true
+NextScreen1=screen,ScreenSMOnlineLoginSet
+NextScreen2=screen,ScreenNetSelectMusic
+NextScreen3=screen,ScreenSelectMusic
 
 [ScreenPlayerOptions]
 Fallback=ScreenOptions