diff --git a/stepmania/Themes/default/Scripts/Branches.lua b/stepmania/Themes/default/Scripts/Branches.lua index 4a490a2b64..6d8448f942 100644 --- a/stepmania/Themes/default/Scripts/Branches.lua +++ b/stepmania/Themes/default/Scripts/Branches.lua @@ -19,8 +19,8 @@ function SongSelectionScreen() end function SMOnlineScreen() - if not IsSMOnlineLoggedIn(1) and GAMESTATE:IsPlayerEnabled(PLAYER_1) then return "ScreenSMOnlineLogin" end - if not IsSMOnlineLoggedIn(2) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then return "ScreenSMOnlineLogin" end + if not IsSMOnlineLoggedIn(PLAYER_1) and GAMESTATE:IsPlayerEnabled(PLAYER_1) then return "ScreenSMOnlineLogin" end + if not IsSMOnlineLoggedIn(PLAYER_2) and GAMESTATE:IsPlayerEnabled(PLAYER_2) then return "ScreenSMOnlineLogin" end return "ScreenNetRoom" end diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index d425f8493d..86f338096f 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -872,7 +872,7 @@ LuaFunction_NoArgs( IsNetConnected, NSMAN->useSMserver ) LuaFunction_NoArgs( IsNetSMOnline, NSMAN->isSMOnline ) static bool ReportStyle() { NSMAN->ReportStyle(); return true; } LuaFunction_NoArgs( ReportStyle, ReportStyle() ) -LuaFunction_PlayerNumber( IsSMOnlineLoggedIn, NSMAN->isSMOLoggedIn[pn] ) +LuaFunction_Int( IsSMOnlineLoggedIn, NSMAN->isSMOLoggedIn[a1] ) /* * (c) 2003-2004 Charles Lohr, Joshua Allen