mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 13:16:39 +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:
+1
-7
@@ -94,14 +94,8 @@
|
||||
ClientList client_list;
|
||||
GroupLFPList LFPGroupList;
|
||||
ZSList zoneserver_list;
|
||||
<<<<<<< kinglykrab/ucsconnection-global-to-singleton
|
||||
LoginServerList loginserverlist;
|
||||
=======
|
||||
UCSConnection UCSLink;
|
||||
>>>>>>> master
|
||||
QueryServConnection QSLink;
|
||||
LauncherList launcher_list;
|
||||
AdventureManager adventure_manager;
|
||||
WorldEventScheduler event_scheduler;
|
||||
volatile bool RunLoops = true;
|
||||
uint32 numclients = 0;
|
||||
@@ -471,7 +465,7 @@ int main(int argc, char **argv)
|
||||
zoneserver_list.Process();
|
||||
launcher_list.Process();
|
||||
LFPGroupList.Process();
|
||||
adventure_manager.Process();
|
||||
AdventureManager::Instance()->Process();
|
||||
SharedTaskManager::Instance()->Process();
|
||||
dynamic_zone_manager.Process();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user