diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-07-18 00:45:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-07-18 00:45:21 +0200 |
| commit | f45ae7af431402e6d9e4aff488a4cc64b9dfffd3 (patch) | |
| tree | 6c54bda7142685753cba36d6b2b19a489ffa1dea /src/server/game/Entities | |
| parent | 85d637bab6baa237f5d2dd04d72a79f065e0b103 (diff) | |
Core/PacketIO: Updated spell packets
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 39a3c1f7c5a..5bd10809712 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8275,7 +8275,7 @@ void Player::CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 } } -void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, uint32 misc) +void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, int32* misc) { ItemTemplate const* proto = item->GetTemplate(); // special learning case @@ -8325,7 +8325,8 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE); spell->m_CastItem = item; spell->m_cast_count = castCount; // set count of casts - spell->m_misc.Data = misc; + spell->m_misc.Raw.Data[0] = misc[0]; + spell->m_misc.Raw.Data[1] = misc[1]; spell->prepare(&targets); ++count; @@ -8353,7 +8354,8 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE); spell->m_CastItem = item; spell->m_cast_count = castCount; // set count of casts - spell->m_misc.Data = misc; // glyph index + spell->m_misc.Raw.Data[0] = misc[0]; + spell->m_misc.Raw.Data[1] = misc[1]; spell->prepare(&targets); ++count; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 940456ba3b2..2455fc54646 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2292,7 +2292,7 @@ class Player : public Unit, public GridObject<Player> void UpdateItemSetAuras(bool formChange = false); void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); - void CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, uint32 misc); + void CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, int32* misc); void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item* item, ItemTemplate const* proto); void SendEquipmentSetList(); |