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

Post merge fix

Browse Source
This commit is contained in:
Chris Miles 2025-06-25 14:38:13 -05:00
parent 403e441d98
commit b381ce74c8
5 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
world/adventure.cpp
View File

@ -17,11 +17,7 @@
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern ClientList client_list; extern ClientList client_list;
<<<<<<< kinglykrab/adventuremanager-global-to-singleton
extern EQ::Random emu_random; extern EQ::Random emu_random;
=======
extern AdventureManager adventure_manager;
>>>>>>> master
Adventure::Adventure(AdventureTemplate *t) Adventure::Adventure(AdventureTemplate *t)
{ {

10
world/main.cpp
View File

@ -94,11 +94,6 @@
ClientList client_list; ClientList client_list;
GroupLFPList LFPGroupList; GroupLFPList LFPGroupList;
ZSList zoneserver_list; ZSList zoneserver_list;
<<<<<<< kinglykrab/ucsconnection-global-to-singleton
LoginServerList loginserverlist;
=======
UCSConnection UCSLink;
>>>>>>> master
QueryServConnection QSLink; QueryServConnection QSLink;
LauncherList launcher_list; LauncherList launcher_list;
WorldEventScheduler event_scheduler; WorldEventScheduler event_scheduler;
@ -470,13 +465,8 @@ int main(int argc, char **argv)
zoneserver_list.Process(); zoneserver_list.Process();
launcher_list.Process(); launcher_list.Process();
LFPGroupList.Process(); LFPGroupList.Process();
<<<<<<< kinglykrab/adventuremanager-global-to-singleton
AdventureManager::Instance()->Process(); AdventureManager::Instance()->Process();
shared_task_manager.Process();
=======
adventure_manager.Process();
SharedTaskManager::Instance()->Process(); SharedTaskManager::Instance()->Process();
>>>>>>> master
dynamic_zone_manager.Process(); dynamic_zone_manager.Process();
if (!RuleB(Logging, PlayerEventsQSProcess)) { if (!RuleB(Logging, PlayerEventsQSProcess)) {

5
world/world_boot.cpp
View File

@ -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; extern WorldEventScheduler event_scheduler;
bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv) bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)

5
world/zoneserver.cpp
View File

@ -57,11 +57,6 @@ extern GroupLFPList LFPGroupList;
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern volatile bool RunLoops; extern volatile bool RunLoops;
extern volatile bool UCSServerAvailable_; extern volatile bool UCSServerAvailable_;
<<<<<<< kinglykrab/adventuremanager-global-to-singleton
extern UCSConnection UCSLink;
=======
extern AdventureManager adventure_manager;
>>>>>>> master
extern QueryServConnection QSLink; extern QueryServConnection QSLink;
void CatchSignal(int sig_num); void CatchSignal(int sig_num);

6
zone/main.cpp
View File

@ -105,12 +105,6 @@ QuestParserCollection *parse = 0;
ZoneEventScheduler event_scheduler; ZoneEventScheduler event_scheduler;
WorldContentService content_service; WorldContentService content_service;
PlayerEventLogs player_event_logs; 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; const SPDat_Spell_Struct* spells;
int32 SPDAT_RECORDS = -1; int32 SPDAT_RECORDS = -1;