diff options
| author | megamage <none@none> | 2009-05-03 10:48:28 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-03 10:48:28 -0500 |
| commit | 2a725194b67539a917898fd6b45625eb52154303 (patch) | |
| tree | c8b3d578e9c57b9cd07ab066719f2da342d46e89 /src/game/Spell.cpp | |
| parent | 99cc10d0d71b8d9fff0e2fae981a0602d7634959 (diff) | |
| parent | eb3c3a8fb4a4bac2e01222bfd25efd80fc792ba2 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 483678bed0e..9ab0c9d9f1a 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -220,8 +220,9 @@ void SpellCastTargets::Update(Unit* caster) { if(m_targetMask & TARGET_FLAG_ITEM) m_itemTarget = ((Player*)caster)->GetItemByGuid(m_itemTargetGUID); - else + else if(m_targetMask & TARGET_FLAG_TRADE_ITEM) { + // here it is not guid but slot Player* pTrader = ((Player*)caster)->GetTrader(); if(pTrader && m_itemTargetGUID < TRADE_SLOT_COUNT) m_itemTarget = pTrader->GetItemByPos(pTrader->GetItemPosByTradeSlot(m_itemTargetGUID)); |