diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-04-01 20:31:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-04-01 20:31:15 +0200 |
| commit | e1bacef346a859420be8c76129ebc568f04380d0 (patch) | |
| tree | 23986678db02f5e508c13f6dda66df6f1baac7bf /src/server/game/Scripting | |
| parent | 2cc51e24826bdaf29f364f16e49e5a37a6dd85d5 (diff) | |
Core: Removed unused functions (leftovers from sd2, was needed when scripts were built as separate dll)
Diffstat (limited to 'src/server/game/Scripting')
| -rwxr-xr-x | src/server/game/Scripting/ScriptMgr.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Scripting/ScriptMgr.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Scripting/ScriptSystem.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index ff127a45889..f7f5e495280 100755 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -853,7 +853,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger) ASSERT(player); ASSERT(trigger); - GET_SCRIPT_RET(AreaTriggerScript, GetAreaTriggerScriptId(trigger->id), tmpscript, false); + GET_SCRIPT_RET(AreaTriggerScript, sObjectMgr->GetAreaTriggerScriptId(trigger->id), tmpscript, false); return tmpscript->OnTrigger(player, trigger); } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 85c8dfbc866..cde5e54f43a 100755 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1007,7 +1007,7 @@ class ScriptMgr { // Get an ID for the script. An ID only exists if it's a script that is assigned in the database // through a script name (or similar). - uint32 id = GetScriptId(script->GetName().c_str()); + uint32 id = sObjectMgr->GetScriptId(script->GetName().c_str()); if (id) { // Try to find an existing script. diff --git a/src/server/game/Scripting/ScriptSystem.cpp b/src/server/game/Scripting/ScriptSystem.cpp index 68bf8737447..b7d57d46a05 100755 --- a/src/server/game/Scripting/ScriptSystem.cpp +++ b/src/server/game/Scripting/ScriptSystem.cpp @@ -203,7 +203,7 @@ void SystemMgr::LoadScriptWaypoints() pTemp.fZ = pFields[4].GetFloat(); pTemp.uiWaitTime = pFields[5].GetUInt32(); - CreatureInfo const* pCInfo = GetCreatureTemplateStore(pTemp.uiCreatureEntry); + CreatureInfo const* pCInfo = ObjectMgr::GetCreatureTemplate(pTemp.uiCreatureEntry); if (!pCInfo) { |
