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

[Code] EvolvingItemsManager Global to Singleton Cleanup (#4929)

Browse Source 
Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 15:26:29 -04:00
committed by GitHub
parent 1e6a4dac78
commit 128732e05d
12 changed files with 51 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/main.cpp
+8 -3
View File
@@ -105,7 +105,12 @@ QuestParserCollection *parse = 0;
ZoneEventScheduler event_scheduler;
WorldContentService content_service;
PlayerEventLogs player_event_logs;
<<<<<<< kinglykrab/evolvingitemsmanager-global-to-singleton
DatabaseUpdate database_update;
SkillCaps skill_caps;
=======
EvolvingItemsManager evolving_items_manager;
>>>>>>> master
const SPDat_Spell_Struct* spells;
int32 SPDAT_RECORDS = -1;
@@ -394,9 +399,9 @@ int main(int argc, char **argv)
content_db.LoadTributes();
// Load evolving item data
evolving_items_manager.SetDatabase(&database);
evolving_items_manager.SetContentDatabase(&content_db);
evolving_items_manager.LoadEvolvingItems();
EvolvingItemsManager::Instance()->SetDatabase(&database);
EvolvingItemsManager::Instance()->SetContentDatabase(&content_db);
EvolvingItemsManager::Instance()->LoadEvolvingItems();
database.GetDecayTimes(npcCorpseDecayTimes);