From 0cddecf2d4d2863bbd0c400c67227a07cbac1f7e Mon Sep 17 00:00:00 2001 From: Shocker Date: Fri, 27 May 2016 12:29:12 +0300 Subject: 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) --- src/server/scripts/Commands/cs_pet.cpp | 6 +++--- src/server/scripts/Spells/spell_warlock.cpp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index 28324c5a96d..c82129ca7ec 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; } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index f735cb1be64..33a70c5d28e 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -494,6 +494,8 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader case CREATURE_FAMILY_IMP: targetCreature->CastSpell(targetCreature, SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP, true); break; + default: + break; } } } -- cgit v1.2.3