aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Commands
diff options
context:
space:
mode:
authorShocker <shocker@freakz.ro>2016-05-27 12:29:12 +0300
committerShocker <shocker@freakz.ro>2016-05-27 12:29:12 +0300
commit62635f07d0838ac94c2d1329849e1825406eaaff (patch)
tree83c6625c875ca10e441804c8d32c0b182c6370cb /src/server/scripts/Commands
parentdc67505a081fed7d59fe833ad9ec5a3741a78e8f (diff)
parentc73c51d7b106c11e96e8f11054f3c87e5de426e5 (diff)
Merge pull request #17138 from ForesterDev/creature_family
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
Diffstat (limited to 'src/server/scripts/Commands')
-rw-r--r--src/server/scripts/Commands/cs_pet.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index 787265cc19b..a86de766117 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -69,10 +69,10 @@ public:
}
CreatureTemplate const* creatureTemplate = creatureTarget->GetCreatureTemplate();
- // Creatures with family 0 crashes the server
- if (!creatureTemplate->family)
+ // Creatures with family CREATURE_FAMILY_NONE crashes the server
+ if (creatureTemplate->family == CREATURE_FAMILY_NONE)
{
- handler->PSendSysMessage("This creature cannot be tamed. (family id: 0).");
+ handler->PSendSysMessage("This creature cannot be tamed. Family id: 0 (CREATURE_FAMILY_NONE).");
handler->SetSentErrorMessage(true);
return false;
}