diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-04-01 23:14:31 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-04-01 23:14:31 +0200 |
| commit | 7b35d733170236b991785c5934aa2233fe4da413 (patch) | |
| tree | da1818e6c8bf2c36872e889631cfe5e0507e2206 /src/server/game | |
| parent | e1bacef346a859420be8c76129ebc568f04380d0 (diff) | |
Revert part of "Core: Removed unused functions (leftovers from sd2, was needed when scripts were built as separate dll)", this part wasnt intended
This reverts commit partly e1bacef346a859420be8c76129ebc568f04380d0.
Diffstat (limited to 'src/server/game')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 5 | ||||
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.h | 1 | ||||
| -rwxr-xr-x | src/server/game/Scripting/ScriptMgr.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 485c86decce..bae25b56fc5 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -9180,6 +9180,11 @@ bool LoadTrinityStrings(char const* table, int32 start_value, int32 end_value) return sObjectMgr->LoadTrinityStrings(table, start_value, end_value); } +uint32 GetScriptId(const char *name) +{ + return sObjectMgr->GetScriptId(name); +} + CreatureBaseStats const* ObjectMgr::GetCreatureBaseStats(uint8 level, uint8 unitClass) { CreatureBaseStatsMap::const_iterator it = m_creatureBaseStatsMap.find(MAKE_PAIR16(level,unitClass)); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 392a4fd7207..e2c3ea88630 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -1421,5 +1421,6 @@ class ObjectMgr // scripting access functions bool LoadTrinityStrings(char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min()); +uint32 GetScriptId(const char *name); #endif diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index cde5e54f43a..85c8dfbc866 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 = sObjectMgr->GetScriptId(script->GetName().c_str()); + uint32 id = GetScriptId(script->GetName().c_str()); if (id) { // Try to find an existing script. |
