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

[Code] WorldEventScheduler and ZoneEventScheduler Global to Singleton Cleanup (#4932)

Browse Source
This commit is contained in:
Alex King
2025-06-25 15:47:37 -04:00
committed by GitHub
parent f304f9cc61
commit 967a13e692
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/main.cpp
+3 -5
View File
@@ -88,7 +88,6 @@ extern volatile bool is_zone_loaded;
#include "../common/path_manager.h"
#include "../common/database/database_update.h"
#include "../common/skill_caps.h"
#include "zone_event_scheduler.h"
#include "zone_cli.h"
EntityList entity_list;
@@ -102,7 +101,6 @@ TitleManager title_manager;
QueryServ *QServ = 0;
NpcScaleManager *npc_scale_manager;
QuestParserCollection *parse = 0;
ZoneEventScheduler event_scheduler;
WorldContentService content_service;
PlayerEventLogs player_event_logs;
@@ -416,7 +414,7 @@ int main(int argc, char **argv)
->SetExpansionContext()
->ReloadContentFlags();
event_scheduler.SetDatabase(&database)->LoadScheduledEvents();
ZoneEventScheduler::Instance()->SetDatabase(&database)->LoadScheduledEvents();
EQ::SayLinkEngine::LoadCachedSaylinks();
@@ -482,7 +480,7 @@ int main(int argc, char **argv)
QServ->CheckForConnectState();
worldserver.Connect();
worldserver.SetScheduler(&event_scheduler);
worldserver.SetScheduler(ZoneEventScheduler::Instance());
// sidecar command handler
if (ZoneCLI::RanConsoleCommand(argc, argv)
@@ -626,7 +624,7 @@ int main(int argc, char **argv)
entity_list.MobProcess();
entity_list.BeaconProcess();
entity_list.EncounterProcess();
event_scheduler.Process(zone, &content_service);
ZoneEventScheduler::Instance()->Process(zone, &content_service);
if (zone) {
if (!zone->Process()) {