diff options
| -rw-r--r-- | src/game/SharedDefines.h | 22 | ||||
| -rw-r--r-- | src/game/SpellMgr.h | 22 | ||||
| -rw-r--r-- | src/game/Unit.h | 2 |
3 files changed, 22 insertions, 24 deletions
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 666e5c38710..6a264ecfe32 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -2605,5 +2605,27 @@ enum MailResponseResult MAIL_ERR_ITEM_HAS_EXPIRED = 21, }; +enum SpellFamilyNames +{ + SPELLFAMILY_GENERIC = 0, + SPELLFAMILY_UNK1 = 1, // events, holidays + // 2 - unused + SPELLFAMILY_MAGE = 3, + SPELLFAMILY_WARRIOR = 4, + SPELLFAMILY_WARLOCK = 5, + SPELLFAMILY_PRIEST = 6, + SPELLFAMILY_DRUID = 7, + SPELLFAMILY_ROGUE = 8, + SPELLFAMILY_HUNTER = 9, + SPELLFAMILY_PALADIN = 10, + SPELLFAMILY_SHAMAN = 11, + SPELLFAMILY_UNK2 = 12, // 2 spells (silence resistance) + SPELLFAMILY_POTION = 13, + // 14 - unused + SPELLFAMILY_DEATHKNIGHT = 15, + // 16 - unused + SPELLFAMILY_PET = 17 +}; + #endif diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 1f64dc3f585..a1f52a07eaa 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -46,28 +46,6 @@ enum SpellCategories SPELLCATEGORY_DEVOUR_MAGIC = 12 }; -enum SpellFamilyNames -{ - SPELLFAMILY_GENERIC = 0, - SPELLFAMILY_UNK1 = 1, // events, holidays - // 2 - unused - SPELLFAMILY_MAGE = 3, - SPELLFAMILY_WARRIOR = 4, - SPELLFAMILY_WARLOCK = 5, - SPELLFAMILY_PRIEST = 6, - SPELLFAMILY_DRUID = 7, - SPELLFAMILY_ROGUE = 8, - SPELLFAMILY_HUNTER = 9, - SPELLFAMILY_PALADIN = 10, - SPELLFAMILY_SHAMAN = 11, - SPELLFAMILY_UNK2 = 12, // 2 spells (silence resistance) - SPELLFAMILY_POTION = 13, - // 14 - unused - SPELLFAMILY_DEATHKNIGHT = 15, - // 16 - unused - SPELLFAMILY_PET = 17 -}; - enum SpellDisableTypes { SPELL_DISABLE_PLAYER = 1, diff --git a/src/game/Unit.h b/src/game/Unit.h index b11af5062e7..a0e6f1eecb6 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -36,8 +36,6 @@ #include "DBCStructure.h" #include <list> -enum SpellFamilyNames; - #define WORLD_TRIGGER 12999 enum SpellInterruptFlags |