diff options
| author | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
|---|---|---|
| committer | Drahy <none@none> | 2009-07-07 02:23:41 +0200 |
| commit | a3f00be577f33e41d70ce0c9b0e9e0951d5dc082 (patch) | |
| tree | 1d98d3e898b6e4888eef99cb09ea0a4eca8cd1a7 /src/game/Player.h | |
| parent | a68d8302d54b8d119006f0c5e9fe346e5d0baf24 (diff) | |
| parent | af1c18852446e6be81376a98eba8e2543985479d (diff) | |
* Merge
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.h')
| -rw-r--r-- | src/game/Player.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Player.h b/src/game/Player.h index 38de51033c3..17563688da6 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -1126,7 +1126,7 @@ class TRINITY_DLL_SPEC Player : public Unit return mainItem && mainItem->GetProto()->InventoryType == INVTYPE_2HWEAPON && !CanTitanGrip(); } void SendNewItem( Item *item, uint32 count, bool received, bool created, bool broadcast = false ); - bool BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint64 bagguid, uint8 slot); + bool BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint8 bag, uint8 slot); float GetReputationPriceDiscount( Creature const* pCreature ) const; Player* GetTrader() const { return pTrader; } @@ -1395,7 +1395,7 @@ class TRINITY_DLL_SPEC Player : public Unit void SendInitialSpells(); bool addSpell(uint32 spell_id, bool active, bool learning, bool dependent, bool disabled); void learnSpell(uint32 spell_id, bool dependent); - void removeSpell(uint32 spell_id, bool disabled = false, bool update_action_bar_for_low_rank = false); + void removeSpell(uint32 spell_id, bool disabled = false, bool learn_low_rank = true); void resetSpells(); void learnDefaultSpells(); void learnQuestRewardedSpells(); @@ -1437,6 +1437,8 @@ class TRINITY_DLL_SPEC Player : public Unit PlayerSpellMap const& GetSpellMap() const { return m_spells; } PlayerSpellMap & GetSpellMap() { return m_spells; } + SpellCooldowns const& GetSpellCooldownMap() const { return m_spellCooldowns; } + void AddSpellMod(SpellModifier* mod, bool apply); bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell * spell = NULL); template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell * spell = NULL); @@ -1463,6 +1465,7 @@ class TRINITY_DLL_SPEC Player : public Unit void SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId = 0, Spell* spell = NULL); void ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs ); void RemoveSpellCooldown(uint32 spell_id, bool update = false); + void RemoveSpellCategoryCooldown(uint32 cat, bool update = false); void SendClearCooldown( uint32 spell_id, Unit* target ); void RemoveCategoryCooldown(uint32 cat); |