diff options
| author | megamage <none@none> | 2009-03-08 11:36:10 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-08 11:36:10 -0600 |
| commit | 985b7656bb8f7de1cb192410f2ee0495dd43ae91 (patch) | |
| tree | ac10c887e7e80fe17956ee2ca0742c40f3d24389 /src/game/ObjectMgr.h | |
| parent | 88c050182cd2628984a0282f66256913cecd188b (diff) | |
| parent | 0f8dee432c4eb78b466744b9e3e13266c6be19d7 (diff) | |
*Merge.
--HG--
branch : trunk
rename : sql/updates/XXX_characters_auctionhouse.sql => sql/updates/1164_characters.sql
Diffstat (limited to 'src/game/ObjectMgr.h')
| -rw-r--r-- | src/game/ObjectMgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index b33e2ac26e4..ea73fb15715 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -739,6 +739,7 @@ class ObjectMgr void LoadSpellDisabledEntrys(); bool IsPlayerSpellDisabled(uint32 spellid) { return (m_DisabledPlayerSpells.count(spellid) != 0); } bool IsCreatureSpellDisabled(uint32 spellid) { return (m_DisabledCreatureSpells.count(spellid) != 0); } + bool IsPetSpellDisabled(uint32 spellid) { return (m_DisabledPetSpells.count(spellid) != 0); } int GetIndexForLocale(LocaleConstant loc); LocaleConstant GetLocaleForIndex(int i); @@ -859,6 +860,7 @@ class ObjectMgr std::set<uint32> m_DisabledPlayerSpells; std::set<uint32> m_DisabledCreatureSpells; + std::set<uint32> m_DisabledPetSpells; GraveYardMap mGraveYardMap; |