Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core: define CREATURE_FAMILY_NONE to avoid magic numbers in code

Browse Source
This commit is contained in:
Aokromes
2016-07-20 12:49:38 +02:00
parent dadd81afe0
commit 11636faadf
6 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Commands/cs_pet.cpp
View File

@@ -69,10 +69,10 @@ public:
}
CreatureTemplate const* creatureTemplate = creatureTarget->GetCreatureTemplate();
// Creatures with family 0 crashes the server
// Creatures with family CREATURE_FAMILY_NONE crashes the server
if (!creatureTemplate->family)
{
handler->PSendSysMessage("This creature cannot be tamed. (family id: 0).");
handler->PSendSysMessage("This creature cannot be tamed. (family id: CREATURE_FAMILY_NONE).");
handler->SetSentErrorMessage(true);
return false;
}

2
src/server/scripts/Spells/spell_warlock.cpp
View File

@@ -508,6 +508,8 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
case CREATURE_FAMILY_IMP:
targetCreature->CastSpell(targetCreature, SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP, true);
break;
default:
break;
}
}
}