[Code] WorldEventScheduler and ZoneEventScheduler Global to Singleton Cleanup

This commit is contained in:
Kinglykrab
2025-06-20 22:02:20 -04:00
committed by Chris Miles
parent f304f9cc61
commit 3c03641e8d
5 changed files with 17 additions and 10 deletions
+1 -2
View File
@@ -95,7 +95,6 @@ ClientList client_list;
GroupLFPList LFPGroupList;
ZSList zoneserver_list;
LauncherList launcher_list;
WorldEventScheduler event_scheduler;
volatile bool RunLoops = true;
uint32 numclients = 0;
uint32 numzones = 0;
@@ -418,7 +417,7 @@ int main(int argc, char **argv)
}
}
event_scheduler.Process(&zoneserver_list);
WorldEventScheduler::Instance()->Process(&zoneserver_list);
client_list.Process();
guild_mgr.Process();
+1 -3
View File
@@ -224,8 +224,6 @@ void WorldBoot::RegisterLoginservers()
}
}
extern WorldEventScheduler event_scheduler;
bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
{
// logging system init
@@ -389,7 +387,7 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
content_db.LoadCharacterCreateCombos();
LogInfo("Initializing [EventScheduler]");
event_scheduler.SetDatabase(&database)->LoadScheduledEvents();
WorldEventScheduler::Instance()->SetDatabase(&database)->LoadScheduledEvents();
LogInfo("Initializing [WorldContentService]");
content_service.SetDatabase(&database)
+6
View File
@@ -7,6 +7,12 @@
class WorldEventScheduler : public ServerEventScheduler {
public:
void Process(ZSList *zs_list);
static WorldEventScheduler* Instance()
{
static WorldEventScheduler instance;
return &instance;
}
};
#endif //EQEMU_EVENT_SCHEDULER_H