diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:01 +0100 |
| commit | ac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (patch) | |
| tree | 9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | d268b81044707e15266eadb4ab49f176135d4c26 (diff) | |
| parent | 43d5fb5eaefeafb34bea10ff5c6a2878c6c14df1 (diff) | |
Merge branch 'dbc' of https://github.com/Intel/TrinityCore into Intel-dbc
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Events/GameEventMgr.cpp
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 4d4ef75ba35..ac0b5bbf2e6 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -513,7 +513,7 @@ void ScriptMgr::OnGroupRateCalculation(float& rate, uint32 count, bool isRaid) MapEntry const* C = I->second->GetEntry(); \ if (!C) \ continue; \ - if (C->MapID == V->GetId()) \ + if (C->ID == V->GetId()) \ { #define SCR_MAP_END \ @@ -925,7 +925,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger) ASSERT(player); ASSERT(trigger); - GET_SCRIPT_RET(AreaTriggerScript, sObjectMgr->GetAreaTriggerScriptId(trigger->id), tmpscript, false); + GET_SCRIPT_RET(AreaTriggerScript, sObjectMgr->GetAreaTriggerScriptId(trigger->ID), tmpscript, false); return tmpscript->OnTrigger(player, trigger); } |