Skip to content

Commit

Permalink
remove unused param from issmonlineloggedin
Browse files Browse the repository at this point in the history
  • Loading branch information
poco0317 committed Aug 30, 2021
1 parent 93a8210 commit 83d5f7d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Themes/Til Death/BGAnimations/_PlayerInfo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions Themes/Til Death/Scripts/02 Branches.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Themes/_fallback/BGAnimations/ScreenChatOverlay overlay.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Themes/_fallback/Scripts/02 Branches.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 83d5f7d

Please sign in to comment.