mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 22:58:34 +00:00
[Code] AdventureManager Global to Singleton Cleanup (#4931)
* [Code] AdventureManager Global to Singleton Cleanup * Post merge fix --------- Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
@@ -105,12 +105,6 @@ 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;
|
||||
|
||||
Reference in New Issue
Block a user