mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-17 10:48:21 +00:00
[Code] ZSList Global to Singleton Cleanup (#4940)
* [Code] ZSList Global to Singleton Cleanup * Final * Post merge fixes --------- Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
#include "cliententry.h"
|
||||
#include "world_config.h"
|
||||
|
||||
extern ZSList zoneserver_list;
|
||||
extern ClientList client_list;
|
||||
extern uint32 numzones;
|
||||
extern uint32 numplayers;
|
||||
@@ -312,7 +311,7 @@ void LoginServer::ProcessSystemwideMessage(uint16_t opcode, EQ::Net::Packet &p)
|
||||
LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
|
||||
|
||||
ServerSystemwideMessage *swm = (ServerSystemwideMessage *) p.Data();
|
||||
zoneserver_list.SendEmoteMessageRaw(
|
||||
ZSList::Instance()->SendEmoteMessageRaw(
|
||||
0,
|
||||
0,
|
||||
AccountStatus::Player,
|
||||
@@ -376,7 +375,7 @@ bool LoginServer::Connect()
|
||||
|
||||
SendInfo();
|
||||
SendStatus();
|
||||
zoneserver_list.SendLSZones();
|
||||
ZSList::Instance()->SendLSZones();
|
||||
|
||||
m_statusupdate_timer = std::make_unique<EQ::Timer>(
|
||||
LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
|
||||
@@ -485,7 +484,7 @@ bool LoginServer::Connect()
|
||||
);
|
||||
SendInfo();
|
||||
SendStatus();
|
||||
zoneserver_list.SendLSZones();
|
||||
ZSList::Instance()->SendLSZones();
|
||||
|
||||
m_statusupdate_timer = std::make_unique<EQ::Timer>(
|
||||
LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
|
||||
|
||||
Reference in New Issue
Block a user