mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-03 03:50:40 +00:00
[Code] LoginServerList Global to Singleton Cleanup (#4941)
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user