pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 10:31:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] LFGuildManager Global to Singleton Cleanup (#4927)

Browse Source 
* [Code] LFGuildManager Global to Singleton Cleanup

* Update lfguild.h

* Update worldserver.cpp

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King 2025-06-25 15:19:52 -04:00 committed by GitHub
parent c5ab35e4af
commit 654764685a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
queryserv/lfguild.h
View File

@ -44,6 +44,12 @@ 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);

5
queryserv/queryserv.cpp
View File

@ -25,7 +25,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;
@ -154,7 +153,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();
@ -168,7 +167,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()) {

3
queryserv/worldserver.cpp
View File

@ -26,7 +26,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;
extern ZSList zs_list; extern ZSList zs_list;
WorldServer::WorldServer() WorldServer::WorldServer()
@ -116,7 +115,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;
} }