diff options
| author | Shocker <shocker@freakz.ro> | 2016-05-27 12:29:12 +0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-01-09 20:52:48 +0100 |
| commit | 0cddecf2d4d2863bbd0c400c67227a07cbac1f7e (patch) | |
| tree | 6c1ba0bee039a22e6f63705bde10c0deb638838e /src/server/game/Globals/ObjectMgr.cpp | |
| parent | 5d4569a11b36a97cf211681e127ea91b958f042c (diff) | |
Merge pull request #17138 from ForesterDev/creature_family
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
(cherry picked from commit 62635f07d0838ac94c2d1329849e1825406eaaff)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f58eb8ba8a7..fc19f9ebad1 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -496,7 +496,7 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields) creatureTemplate.unit_flags = fields[32].GetUInt32(); creatureTemplate.unit_flags2 = fields[33].GetUInt32(); creatureTemplate.dynamicflags = fields[34].GetUInt32(); - creatureTemplate.family = uint32(fields[35].GetUInt8()); + creatureTemplate.family = CreatureFamily(fields[35].GetUInt8()); creatureTemplate.trainer_type = uint32(fields[36].GetUInt8()); creatureTemplate.trainer_class = uint32(fields[37].GetUInt8()); creatureTemplate.trainer_race = uint32(fields[38].GetUInt8()); @@ -915,7 +915,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) if (cInfo->family && !sCreatureFamilyStore.LookupEntry(cInfo->family) && cInfo->family != CREATURE_FAMILY_HORSE_CUSTOM) { TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid creature family (%u) in `family`.", cInfo->Entry, cInfo->family); - const_cast<CreatureTemplate*>(cInfo)->family = 0; + const_cast<CreatureTemplate*>(cInfo)->family = CREATURE_FAMILY_NONE; } if (cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE) |