diff options
author | Shauren <none@none> | 2010-12-22 21:25:23 +0100 |
---|---|---|
committer | Shauren <none@none> | 2010-12-22 21:25:23 +0100 |
commit | 0f3b9019a88777bef8383e699d27a7e8615f93f2 (patch) | |
tree | b88e120ad46050aa073ee451676801aabbd3eaa1 /src/server/game/Scripting/ScriptMgr.cpp | |
parent | 0948fc5bbed08ae6edee4fa1ff86df5cfbffa996 (diff) |
Core: Get rid of dirty operator workaround for ACE_Singleton class implementation
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rwxr-xr-x | src/server/game/Scripting/ScriptMgr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index aa075a8f836..d1761910e96 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -70,7 +70,7 @@ void DoScriptText(int32 iTextEntry, WorldObject* pSource, Unit* pTarget) return; } - const StringTextData* pData = sScriptSystemMgr.GetTextData(iTextEntry); + const StringTextData* pData = sScriptSystemMgr->GetTextData(iTextEntry); if (!pData) { @@ -192,10 +192,10 @@ void ScriptMgr::Initialize() void ScriptMgr::LoadDatabase() { - sScriptSystemMgr.LoadVersion(); - sScriptSystemMgr.LoadScriptTexts(); - sScriptSystemMgr.LoadScriptTextsCustom(); - sScriptSystemMgr.LoadScriptWaypoints(); + sScriptSystemMgr->LoadVersion(); + sScriptSystemMgr->LoadScriptTexts(); + sScriptSystemMgr->LoadScriptTextsCustom(); + sScriptSystemMgr->LoadScriptWaypoints(); } struct TSpellSummary @@ -291,7 +291,7 @@ void ScriptMgr::FillSpellSummary() void ScriptMgr::CreateSpellScripts(uint32 spell_id, std::list<SpellScript *> & script_vector) { - SpellScriptsBounds bounds = sObjectMgr.GetSpellScriptsBounds(spell_id); + SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(spell_id); for (SpellScriptsMap::iterator itr = bounds.first; itr != bounds.second; ++itr) { @@ -312,7 +312,7 @@ void ScriptMgr::CreateSpellScripts(uint32 spell_id, std::list<SpellScript *> & s void ScriptMgr::CreateAuraScripts(uint32 spell_id, std::list<AuraScript *> & script_vector) { - SpellScriptsBounds bounds = sObjectMgr.GetSpellScriptsBounds(spell_id); + SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(spell_id); for (SpellScriptsMap::iterator itr = bounds.first; itr != bounds.second; ++itr) { @@ -333,7 +333,7 @@ void ScriptMgr::CreateAuraScripts(uint32 spell_id, std::list<AuraScript *> & scr void ScriptMgr::CreateSpellScriptLoaders(uint32 spell_id, std::vector<std::pair<SpellScriptLoader *, SpellScriptsMap::iterator> > & script_vector) { - SpellScriptsBounds bounds = sObjectMgr.GetSpellScriptsBounds(spell_id); + SpellScriptsBounds bounds = sObjectMgr->GetSpellScriptsBounds(spell_id); script_vector.reserve(std::distance(bounds.first, bounds.second)); for (SpellScriptsMap::iterator itr = bounds.first; itr != bounds.second; ++itr) |