* Added new World::OnStartup/OnShutdown hooks.

--HG--
branch : trunk

2 files changed, 18 insertions, 0 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 86336d138c6..ba9e848a566 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1012,6 +1012,16 @@ void ScriptMgr::OnRelocate(Transport* transport, uint32 mapId, float x, float y,
     tmpscript->OnRelocate(transport, mapId, x, y, z);
 }
 
+void ScriptMgr::OnStartup()
+{
+    FOREACH_SCRIPT(WorldScript)->OnStartup();
+}
+
+void ScriptMgr::OnShutdown()
+{
+    FOREACH_SCRIPT(WorldScript)->OnShutdown();
+}
+
 void SpellHandlerScript::RegisterSelf()
 {
     ScriptMgr::ScriptRegistry<SpellHandlerScript>::AddScript(this);
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 971924b6b58..e735c7b9765 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -292,6 +292,12 @@ class WorldScript : public ScriptObject, public UpdatableScript<void>
 
         // Called on every world tick (don't execute too heavy code here).
         virtual void OnUpdate(void* null, uint32 diff) { }
+
+        // Called when the world is started.
+        virtual void OnStartup() { }
+
+        // Called when the world is actually shut down.
+        virtual void OnShutdown() { }
 };
 
 class FormulaScript : public ScriptObject
@@ -787,6 +793,8 @@ class ScriptMgr
         void OnShutdownInitiate(ShutdownExitCode code, ShutdownMask mask);
         void OnShutdownCancel();
         void OnWorldUpdate(uint32 diff);
+        void OnStartup();
+        void OnShutdown();
 
     public: /* FormulaScript */