From 5c2705fadc164bb04e6d26e6d8b3e14e05f316ce Mon Sep 17 00:00:00 2001 From: ForesterDev Date: Thu, 26 May 2016 12:56:50 +0400 Subject: Core: updated creature type flags enum (#17128) Core/Misc: Update CreatureTypeFlags enum according to TrinityCoreWiki (cherry picked from commit fb0881398a106806fad48abe9ffd600e0caf175d) # Conflicts: # src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp # src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp # src/server/game/AI/SmartScripts/SmartAI.cpp # src/server/game/Entities/Unit/Unit.cpp # src/server/game/Miscellaneous/SharedDefines.h --- src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 +- src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/AI/ScriptedAI') diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index 1ab731f45c6..0d64baf1c7f 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -72,7 +72,7 @@ bool npc_escortAI::AssistPlayerInCombat(Unit* who) return false; //experimental (unknown) flag not present - if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST)) + if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_CAN_ASSIST)) return false; //not a player diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index da9299380f2..c255993448a 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -69,7 +69,7 @@ bool FollowerAI::AssistPlayerInCombat(Unit* who) return false; //experimental (unknown) flag not present - if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPEFLAGS_CAN_ASSIST)) + if (!(me->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_CAN_ASSIST)) return false; //not a player -- cgit v1.2.3