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] WorldContentServer Global to Singleton Cleanup (#4939)

Browse Source
This commit is contained in:
Alex King
2025-06-25 15:55:39 -04:00
committed by GitHub
parent c99bda3f47
commit c0bb32ed12
20 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/main.cpp
+3 -3
View File
@@ -101,7 +101,6 @@ TitleManager title_manager;
QueryServ *QServ = 0;
NpcScaleManager *npc_scale_manager;
QuestParserCollection *parse = 0;
WorldContentService content_service;
PlayerEventLogs player_event_logs;
const SPDat_Spell_Struct* spells;
@@ -409,7 +408,7 @@ int main(int argc, char **argv)
LogInfo("Loaded [{}] commands loaded", Strings::Commify(std::to_string(retval)));
}
content_service.SetDatabase(&database)
WorldContentService::Instance()->SetDatabase(&database)
->SetContentDatabase(&content_db)
->SetExpansionContext()
->ReloadContentFlags();
@@ -624,7 +623,8 @@ int main(int argc, char **argv)
entity_list.MobProcess();
entity_list.BeaconProcess();
entity_list.EncounterProcess();
ZoneEventScheduler::Instance()->Process(zone, &content_service);
ZoneEventScheduler::Instance()->Process(zone, WorldContentService::Instance());
if (zone) {
if (!zone->Process()) {