diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-19 19:31:54 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-19 19:31:54 +0200 |
| commit | 836221aaf5420afe8ff4719780426251c222b87d (patch) | |
| tree | 12a66ff491e38f75bb922c21616b93fd24b85ddf /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | cc07a491f64fa958c8a27079bd2def84c577f816 (diff) | |
| parent | d463273ab1c8efb9dd6000ee5cb8f780574cdd1e (diff) | |
Merge branch 'legion' into 6.x
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d7bfc47bf79..de13f63e099 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -20,7 +20,6 @@ #include "ScriptReloadMgr.h" #include "Config.h" #include "DatabaseEnv.h" -#include "DBCStores.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" #include "ScriptSystem.h" @@ -1497,13 +1496,13 @@ bool ScriptMgr::OnQuestAccept(Player* player, Item* item, Quest const* quest) return tmpscript->OnQuestAccept(player, item, quest); } -bool ScriptMgr::OnItemUse(Player* player, Item* item, SpellCastTargets const& targets) +bool ScriptMgr::OnItemUse(Player* player, Item* item, SpellCastTargets const& targets, ObjectGuid castId) { ASSERT(player); ASSERT(item); GET_SCRIPT_RET(ItemScript, item->GetScriptId(), tmpscript, false); - return tmpscript->OnUse(player, item, targets); + return tmpscript->OnUse(player, item, targets, castId); } bool ScriptMgr::OnItemExpire(Player* player, ItemTemplate const* proto) |