pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 17:26:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] ZSList Global to Singleton Cleanup (#4940)

Browse Source 
* [Code] ZSList Global to Singleton Cleanup

* Final

* Post merge fixes

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:16:44 -04:00
committed by GitHub
parent 643ee56433
commit dc261bb203
24 changed files with 266 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/clientlist.cpp
+11 -12
View File
@@ -36,7 +36,6 @@
#include "../common/zone_store.h"
#include <set>
extern ZSList zoneserver_list;
uint32 numplayers = 0; //this really wants to be a member variable of ClientList...
ClientList::ClientList()
@@ -232,7 +231,7 @@ void ClientList::DisconnectByIP(uint32 in_ip) {
strn0cpy(skp->adminname, "SessionLimit", sizeof(skp->adminname));
strn0cpy(skp->name, cle->name(), sizeof(skp->name));
skp->adminrank = 255;
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
safe_delete(pack);
}
cle->SetOnline(CLE_Status::Offline);
@@ -551,7 +550,7 @@ void ClientList::SendOnlineGuildMembers(uint32 FromID, uint32 GuildID)
Iterator.Advance();
}
zoneserver_list.SendPacket(from->zone(), from->instance(), pack);
ZSList::Instance()->SendPacket(from->zone(), from->instance(), pack);
safe_delete(pack);
}
@@ -1316,7 +1315,7 @@ void ClientList::RemoveCLEReferances(ClientListEntry* cle) {
bool ClientList::SendPacket(const char* to, ServerPacket* pack) {
if (to == 0 || to[0] == 0) {
zoneserver_list.SendPacket(pack);
ZSList::Instance()->SendPacket(pack);
return true;
}
else if (to[0] == '*') {
@@ -1332,7 +1331,7 @@ bool ClientList::SendPacket(const char* to, ServerPacket* pack) {
}
return false;
} else {
ZoneServer* zs = zoneserver_list.FindByName(to);
ZoneServer* zs = ZSList::Instance()->FindByName(to);
if (zs != nullptr) {
zs->SendPacket(pack);
return true;
@@ -1437,7 +1436,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
);
if (client_count[EQ::versions::ClientVersion::Titanium]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1450,7 +1449,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
if (client_count[EQ::versions::ClientVersion::SoF]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1463,7 +1462,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
if (client_count[EQ::versions::ClientVersion::SoD]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1476,7 +1475,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
if (client_count[EQ::versions::ClientVersion::UF]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1489,7 +1488,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
if (client_count[EQ::versions::ClientVersion::RoF]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1502,7 +1501,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
if (client_count[EQ::versions::ClientVersion::RoF2]) {
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,
@@ -1515,7 +1514,7 @@ void ClientList::SendClientVersionSummary(const char *Name)
}
zoneserver_list.SendEmoteMessage(
ZSList::Instance()->SendEmoteMessage(
Name,
0,
AccountStatus::Player,