diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-02-12 02:37:42 +0000 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-02-12 02:37:42 +0000 |
| commit | 20aa605485a0772910766255a8e5e4ba2f2d92bc (patch) | |
| tree | 9dcde00afcaa7cb6638e0fb813ef48bc7ab8f8ff /src/server/game/Entities/Player | |
| parent | 6678635cc7e4df00a265d19653dbbfc2ef5c8eec (diff) | |
Core/Packets: Update and enable CMSG_USE_ITEM
Ref #14115
Diffstat (limited to 'src/server/game/Entities/Player')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ef2dea207b5..fc7dff4dcac 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8316,7 +8316,7 @@ void Player::CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 } } -void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex) +void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, uint32 misc) { ItemTemplate const* proto = item->GetTemplate(); // special learning case @@ -8337,7 +8337,7 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 Spell* spell = new Spell(this, spellInfo, TRIGGERED_NONE); spell->m_CastItem = item; - spell->m_cast_count = cast_count; //set count of casts + spell->m_cast_count = castCount; //set count of casts spell->SetSpellValue(SPELLVALUE_BASE_POINT0, learning_spell_id); spell->prepare(&targets); return; @@ -8365,8 +8365,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 = cast_count; // set count of casts - spell->m_misc.Data = glyphIndex; // glyph index + spell->m_cast_count = castCount; // set count of casts + spell->m_misc.Data = misc; spell->prepare(&targets); ++count; @@ -8393,8 +8393,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 = cast_count; // set count of casts - spell->m_misc.Data = glyphIndex; // glyph index + spell->m_cast_count = castCount; // set count of casts + spell->m_misc.Data = misc; // glyph index spell->prepare(&targets); ++count; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index e3e927bee7b..275a985585a 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2313,7 +2313,7 @@ class Player : public Unit, public GridObject<Player> void ApplyEquipSpell(SpellInfo const* spellInfo, Item* item, bool apply, bool form_change = false); void UpdateEquipSpellsAtFormChange(); void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx); - void CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 cast_count, uint32 glyphIndex); + void CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8 castCount, uint32 misc); void CastItemCombatSpell(Unit* target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item* item, ItemTemplate const* proto); void SendEquipmentSetList(); |