From b381ce74c8e51664a826135f1109e6e1f6aba1aa Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Wed, 25 Jun 2025 14:38:13 -0500 Subject: [PATCH] Post merge fix --- world/adventure.cpp | 4 ---- world/main.cpp | 10 ---------- world/world_boot.cpp | 5 ----- world/zoneserver.cpp | 5 ----- zone/main.cpp | 6 ------ 5 files changed, 30 deletions(-) diff --git a/world/adventure.cpp b/world/adventure.cpp index 4bdac6261..811654573 100644 --- a/world/adventure.cpp +++ b/world/adventure.cpp @@ -17,11 +17,7 @@ extern ZSList zoneserver_list; extern ClientList client_list; -<<<<<<< kinglykrab/adventuremanager-global-to-singleton extern EQ::Random emu_random; -======= -extern AdventureManager adventure_manager; ->>>>>>> master Adventure::Adventure(AdventureTemplate *t) { diff --git a/world/main.cpp b/world/main.cpp index 65a2303ff..6e185e677 100644 --- a/world/main.cpp +++ b/world/main.cpp @@ -94,11 +94,6 @@ ClientList client_list; GroupLFPList LFPGroupList; ZSList zoneserver_list; -<<<<<<< kinglykrab/ucsconnection-global-to-singleton -LoginServerList loginserverlist; -======= -UCSConnection UCSLink; ->>>>>>> master QueryServConnection QSLink; LauncherList launcher_list; WorldEventScheduler event_scheduler; @@ -470,13 +465,8 @@ int main(int argc, char **argv) zoneserver_list.Process(); launcher_list.Process(); LFPGroupList.Process(); -<<<<<<< kinglykrab/adventuremanager-global-to-singleton AdventureManager::Instance()->Process(); - shared_task_manager.Process(); -======= - adventure_manager.Process(); SharedTaskManager::Instance()->Process(); ->>>>>>> master dynamic_zone_manager.Process(); if (!RuleB(Logging, PlayerEventsQSProcess)) { diff --git a/world/world_boot.cpp b/world/world_boot.cpp index e4de08b45..025ae4314 100644 --- a/world/world_boot.cpp +++ b/world/world_boot.cpp @@ -224,11 +224,6 @@ void WorldBoot::RegisterLoginservers() } } -<<<<<<< kinglykrab/adventuremanager-global-to-singleton -extern SharedTaskManager shared_task_manager; -======= -extern AdventureManager adventure_manager; ->>>>>>> master extern WorldEventScheduler event_scheduler; bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv) diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index 0f2b4538e..976a4e462 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -57,11 +57,6 @@ extern GroupLFPList LFPGroupList; extern ZSList zoneserver_list; extern volatile bool RunLoops; extern volatile bool UCSServerAvailable_; -<<<<<<< kinglykrab/adventuremanager-global-to-singleton -extern UCSConnection UCSLink; -======= -extern AdventureManager adventure_manager; ->>>>>>> master extern QueryServConnection QSLink; void CatchSignal(int sig_num); diff --git a/zone/main.cpp b/zone/main.cpp index 39495c22c..77787da1a 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -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;