[Code] LoginServerList Global to Singleton Cleanup (#4941)

This commit is contained in:
Alex King
2025-06-25 14:49:55 -04:00
committed by GitHub
parent 2128b45313
commit 1153c9ab96
10 changed files with 32 additions and 35 deletions
+5 -6
View File
@@ -6,7 +6,6 @@
#include "zonelist.h"
#include "launcher_list.h"
extern LoginServerList loginserverlist;
extern ClientList client_list;
extern ZSList zoneserver_list;
extern LauncherList launcher_list;
@@ -33,8 +32,8 @@ void EQW__IsLocked(WebInterface *i, const std::string& method, const std::string
void EQW__Lock(WebInterface *i, const std::string& method, const std::string& id, const Json::Value& params) {
WorldConfig::LockWorld();
if (loginserverlist.Connected()) {
loginserverlist.SendStatus();
if (LoginServerList::Instance()->Connected()) {
LoginServerList::Instance()->SendStatus();
}
Json::Value ret;
@@ -44,8 +43,8 @@ void EQW__Lock(WebInterface *i, const std::string& method, const std::string& id
void EQW__Unlock(WebInterface *i, const std::string& method, const std::string& id, const Json::Value& params) {
WorldConfig::UnlockWorld();
if (loginserverlist.Connected()) {
loginserverlist.SendStatus();
if (LoginServerList::Instance()->Connected()) {
LoginServerList::Instance()->SendStatus();
}
Json::Value ret;
@@ -69,7 +68,7 @@ void EQW__GetLauncherCount(WebInterface *i, const std::string& method, const std
}
void EQW__GetLoginServerCount(WebInterface *i, const std::string& method, const std::string& id, const Json::Value& params) {
Json::Value ret = loginserverlist.GetServerCount();
Json::Value ret = LoginServerList::Instance()->GetServerCount();
i->SendResponse(id, ret);
}