From 83d5f7d14a25936a9c0ba58a867e062fdd46f1ae Mon Sep 17 00:00:00 2001 From: Barinade Date: Mon, 30 Aug 2021 00:20:48 -0500 Subject: [PATCH] remove unused param from issmonlineloggedin --- Themes/Til Death/BGAnimations/_PlayerInfo.lua | 2 +- Themes/Til Death/Scripts/02 Branches.lua | 9 ++------- .../_fallback/BGAnimations/ScreenChatOverlay overlay.lua | 6 +++--- Themes/_fallback/Scripts/02 Branches.lua | 4 ++-- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Themes/Til Death/BGAnimations/_PlayerInfo.lua b/Themes/Til Death/BGAnimations/_PlayerInfo.lua index 12d57128d1..074bb8d998 100644 --- a/Themes/Til Death/BGAnimations/_PlayerInfo.lua +++ b/Themes/Til Death/BGAnimations/_PlayerInfo.lua @@ -434,7 +434,7 @@ t[#t + 1] = Def.ActorFrame { self:queuecommand("Set") end, SetCommand = function(self) - local online = IsNetSMOnline() and IsSMOnlineLoggedIn(PLAYER_1) and NSMAN:IsETTP() + local online = IsNetSMOnline() and IsSMOnlineLoggedIn() and NSMAN:IsETTP() self:y(AvatarY + 41 - (online and 18 or 0)) self:settextf("%s: %s", translated_info["Judge"], GetTimingDifficulty()) end diff --git a/Themes/Til Death/Scripts/02 Branches.lua b/Themes/Til Death/Scripts/02 Branches.lua index 45a4683955..efe0b2cb05 100644 --- a/Themes/Til Death/Scripts/02 Branches.lua +++ b/Themes/Til Death/Scripts/02 Branches.lua @@ -2,12 +2,7 @@ function SMOnlineScreen() -- used for various SMOnline-enabled screens: if not IsNetSMOnline() then return "ScreenSelectMusic" end - for pn in ivalues(GAMESTATE:GetHumanPlayers()) do - if not IsSMOnlineLoggedIn(pn) then - return "ScreenSMOnlineLogin" - end - end - if not IsSMOnlineLoggedIn(pn) then + if not IsSMOnlineLoggedIn() then return "ScreenSMOnlineLogin" end return "ScreenNetRoom" @@ -25,7 +20,7 @@ Branch.StartGame = function() end Branch.MultiScreen = function() if IsNetSMOnline() then - if not IsSMOnlineLoggedIn(PLAYER_1) then + if not IsSMOnlineLoggedIn() then return "ScreenNetSelectProfile" else return "ScreenNetSelectProfile" --return "ScreenNetRoom" -- cant do this, we need to select a local profile even diff --git a/Themes/_fallback/BGAnimations/ScreenChatOverlay overlay.lua b/Themes/_fallback/BGAnimations/ScreenChatOverlay overlay.lua index 1b18de87df..9a13164a43 100644 --- a/Themes/_fallback/BGAnimations/ScreenChatOverlay overlay.lua +++ b/Themes/_fallback/BGAnimations/ScreenChatOverlay overlay.lua @@ -49,7 +49,7 @@ local isGameplay = false local isInSinglePlayer = false local currentScreen local show = true -local online = IsNetSMOnline() and IsSMOnlineLoggedIn(PLAYER_1) and NSMAN:IsETTP() +local online = IsNetSMOnline() and IsSMOnlineLoggedIn() and NSMAN:IsETTP() local function changeTab(tabName, tabType) currentTabName = tabName currentTabType = tabType @@ -91,7 +91,7 @@ local chat = Def.ActorFrame { isInSinglePlayer = false end - online = IsNetSMOnline() and IsSMOnlineLoggedIn(PLAYER_1) and NSMAN:IsETTP() + online = IsNetSMOnline() and IsSMOnlineLoggedIn() and NSMAN:IsETTP() isGameplay = (currentScreen:find("Gameplay") ~= nil or currentScreen:find("StageInformation") ~= nil or currentScreen:find("PlayerOptions") ~= nil) @@ -131,7 +131,7 @@ chat.MinimiseMessageCommand = function(self) end local i = 0 chat.InitCommand = function(self) - online = IsNetSMOnline() and IsSMOnlineLoggedIn(PLAYER_1) and NSMAN:IsETTP() + online = IsNetSMOnline() and IsSMOnlineLoggedIn() and NSMAN:IsETTP() self:visible(false) MESSAGEMAN:Broadcast("Minimise") end diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index 0eb1c5b49e..b578b26d8d 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -8,7 +8,7 @@ function SMOnlineScreen() -- used for various SMOnline-enabled screens: if not IsNetSMOnline() then return "ScreenSelectMusic" end - if not IsSMOnlineLoggedIn(PLAYER1) then + if not IsSMOnlineLoggedIn() then return "ScreenSMOnlineLogin" end return "ScreenNetRoom" @@ -71,7 +71,7 @@ Branch = { end, MultiScreen = function() if IsNetSMOnline() then - if not IsSMOnlineLoggedIn(PLAYER_1) then + if not IsSMOnlineLoggedIn() then return "ScreenNetSelectProfile" else return "ScreenNetRoom"