Merge branch 'master' into Bot_Raid_work

zone/main.cpp

@@ -78,6 +78,7 @@
 #include <pthread.h>
 #include "../common/unix.h"
 #include "zone_store.h"
+#include "zone_event_scheduler.h"
 
 #endif
 
@@ -101,8 +102,9 @@ QueryServ *QServ          = 0;
 TaskManager *task_manager = 0;
 NpcScaleManager *npc_scale_manager;
 QuestParserCollection *parse = 0;
-EQEmuLogSys LogSys;
-WorldContentService content_service;
+EQEmuLogSys          LogSys;
+ZoneEventScheduler event_scheduler;
+WorldContentService  content_service;
 const SPDat_Spell_Struct* spells;
 int32 SPDAT_RECORDS = -1;
 const ZoneConfig *Config;
@@ -253,9 +255,10 @@ int main(int argc, char** argv) {
 	}
 
 	/* Register Log System and Settings */
-	LogSys.SetGMSayHandler(&Zone::GMSayHookCallBackProcess);
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
+	LogSys.SetDatabase(&database)
+		->LoadLogDatabaseSettings()
+		->SetGMSayHandler(&Zone::GMSayHookCallBackProcess)
+		->StartFileLogs();
 
 	/* Guilds */
 	guild_mgr.SetDatabase(&database);
@@ -384,9 +387,13 @@ int main(int argc, char** argv) {
 		LogInfo("Initialized dynamic dictionary entries");
 	}
 
-	content_service.SetExpansionContext();
+	content_service.SetDatabase(&database)
+		->SetExpansionContext()
+		->ReloadContentFlags();
 
-	ZoneStore::LoadContentFlags();
+	event_scheduler.SetDatabase(&database)->LoadScheduledEvents();
+
+	EQ::SayLinkEngine::LoadCachedSaylinks();
 
 #ifdef BOTS
 	LogInfo("Loading bot commands");
@@ -431,6 +438,7 @@ int main(int argc, char** argv) {
 	parse->ReloadQuests();
 
 	worldserver.Connect();
+	worldserver.SetScheduler(&event_scheduler);
 
 	Timer InterserverTimer(INTERSERVER_TIMER); // does MySQL pings and auto-reconnect
 #ifdef EQPROFILE
@@ -542,11 +550,11 @@ int main(int argc, char** argv) {
 				entity_list.CorpseProcess();
 				entity_list.TrapProcess();
 				entity_list.RaidProcess();
-
 				entity_list.Process();
 				entity_list.MobProcess();
 				entity_list.BeaconProcess();
 				entity_list.EncounterProcess();
+				event_scheduler.Process(zone, &content_service);
 
 				if (zone) {
 					if (!zone->Process()) {