diff options
| -rw-r--r-- | src/game/ObjectMgr.cpp | 2 | ||||
| -rw-r--r-- | src/game/SharedDefines.h | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index b762e2bd85f..36be907cbaa 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -691,7 +691,7 @@ void ObjectMgr::LoadCreatureTemplates() } } - if (cInfo->unit_class && ((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0) + if (!cInfo->unit_class || ((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0) sLog.outErrorDb("Creature (Entry: %u) has invalid unit_class(%u) for creature_template", cInfo->Entry, cInfo->unit_class); if(cInfo->dmgschool >= MAX_SPELL_SCHOOL) diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index e80239b3574..a9714359242 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -94,7 +94,16 @@ enum Classes (1<<(CLASS_MAGE-1)) |(1<<(CLASS_WARLOCK-1))|(1<<(CLASS_DRUID-1)) | \ (1<<(CLASS_DEATH_KNIGHT-1)) ) -#define CLASSMASK_ALL_CREATURES ((1<<(CLASS_WARRIOR-1)) | (1<<(CLASS_PALADIN-1)) | (1<<(CLASS_ROGUE-1)) | (1<<(CLASS_MAGE-1)) ) +// valid classes for creature_template.unit_class +enum UnitClass +{ + UNIT_CLASS_WARRIOR = 1, + UNIT_CLASS_PALADIN = 2, + UNIT_CLASS_ROGUE = 4, + UNIT_CLASS_MAGE = 8, +}; + +#define CLASSMASK_ALL_CREATURES ((1<<(UNIT_CLASS_WARRIOR-1)) | (1<<(UNIT_CLASS_PALADIN-1)) | (1<<(UNIT_CLASS_ROGUE-1)) | (1<<(UNIT_CLASS_MAGE-1)) ) #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1))) |