pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-25 06:18:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] LFGuildManager Global to Singleton Cleanup

Browse Source
This commit is contained in:
Kinglykrab
2025-06-20 21:12:27 -04:00
parent 1be7e56b86
commit 2fb73c50df
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
queryserv/lfguild.h
+5
View File
@@ -44,6 +44,11 @@ public:
bool LoadDatabase(); bool LoadDatabase();
void HandlePacket(ServerPacket *pack); void HandlePacket(ServerPacket *pack);
void ExpireEntries(); void ExpireEntries();
static LFGuildManager* Instance() {
static LFGuildManager instance;
return &instance;
}
private: private:
void SendPlayerMatches(uint32 FromZoneID, uint32 FromInstanceID, char *From, uint32 FromLevel, uint32 ToLevel, uint32 MinAA, uint32 TimeZone, uint32 Classes); void SendPlayerMatches(uint32 FromZoneID, uint32 FromInstanceID, char *From, uint32 FromLevel, uint32 ToLevel, uint32 MinAA, uint32 TimeZone, uint32 Classes);
void SendGuildMatches(uint32 FromZoneID, uint32 FromInstanceID, char *From, uint32 Level, uint32 AAPoints, uint32 TimeZone, uint32 Class); void SendGuildMatches(uint32 FromZoneID, uint32 FromInstanceID, char *From, uint32 Level, uint32 AAPoints, uint32 TimeZone, uint32 Class);
queryserv/queryserv.cpp
+2 -3
View File
@@ -26,7 +26,6 @@ volatile bool RunLoops = true;
QSDatabase qs_database; QSDatabase qs_database;
Database database; Database database;
LFGuildManager lfguildmanager;
std::string WorldShortName; std::string WorldShortName;
const queryservconfig *Config; const queryservconfig *Config;
WorldServer *worldserver = 0; WorldServer *worldserver = 0;
@@ -159,7 +158,7 @@ int main()
worldserver->Connect(); worldserver->Connect();
/* Load Looking For Guild Manager */ /* Load Looking For Guild Manager */
lfguildmanager.LoadDatabase(); LFGuildManager::Instance()->LoadDatabase();
Timer player_event_process_timer(1000); Timer player_event_process_timer(1000);
player_event_logs.SetDatabase(&qs_database)->Init(); player_event_logs.SetDatabase(&qs_database)->Init();
@@ -173,7 +172,7 @@ int main()
} }
if (LFGuildExpireTimer.Check()) { if (LFGuildExpireTimer.Check()) {
lfguildmanager.ExpireEntries(); LFGuildManager::Instance()->ExpireEntries();
} }
if (player_event_process_timer.Check()) { if (player_event_process_timer.Check()) {
queryserv/worldserver.cpp
+1 -2
View File
@@ -24,7 +24,6 @@
extern WorldServer worldserver; extern WorldServer worldserver;
extern const queryservconfig *Config; extern const queryservconfig *Config;
extern QSDatabase qs_database; extern QSDatabase qs_database;
extern LFGuildManager lfguildmanager;
WorldServer::WorldServer() WorldServer::WorldServer()
{ {
@@ -112,7 +111,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
pack.pBuffer = (uchar *) p.Data(); pack.pBuffer = (uchar *) p.Data();
pack.opcode = opcode; pack.opcode = opcode;
pack.size = (uint32) p.Length(); pack.size = (uint32) p.Length();
lfguildmanager.HandlePacket(&pack); LFGuildManager::Instance()->HandlePacket(&pack);
pack.pBuffer = nullptr; pack.pBuffer = nullptr;
break; break;
} }