1 files changed, 13 insertions, 5 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 36df5e20552..fb4f798bcc9 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -834,8 +834,6 @@ class TC_GAME_API GroupScript : public ScriptObject
         virtual void OnDisband(Group* /*group*/) { }
 };
 
-// Placed here due to ScriptRegistry::AddScript dependency.
-#define sScriptMgr ScriptMgr::instance()
 
 // namespace
 // {
@@ -852,12 +850,13 @@ class TC_GAME_API ScriptMgr
         ScriptMgr();
         virtual ~ScriptMgr();
 
+        void FillSpellSummary();
+        void LoadDatabase();
+
     public: /* Initialization */
         static ScriptMgr* instance();
 
         void Initialize();
-        void LoadDatabase();
-        void FillSpellSummary();
 
         const char* ScriptsVersion() const { return "Integrated Trinity Scripts"; }
 
@@ -873,6 +872,12 @@ class TC_GAME_API ScriptMgr
             _script_loader_callback = script_loader_callback;
         }
 
+    public: /* Script contexts */
+        void BeginScriptContext(std::string const& context);
+        void FinishScriptContext();
+
+        void ReleaseScriptContext(std::string const& context);
+
     public: /* Unloading */
 
         void Unload();
@@ -1095,10 +1100,13 @@ class TC_GAME_API ScriptMgr
         void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage);
 
     private:
-
         uint32 _scriptCount;
 
         ScriptLoaderCallbackType _script_loader_callback;
+
+        std::string _currentContext;
 };
 
+#define sScriptMgr ScriptMgr::instance()
+
 #endif