diff options
| author | ForesterDev <forester.manv@gmail.com> | 2016-05-26 12:56:50 +0400 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-01-09 02:00:17 +0100 |
| commit | 5c2705fadc164bb04e6d26e6d8b3e14e05f316ce (patch) | |
| tree | 475cf64e621b6d13bddc42ae4a77a03e782ecaf0 /src/server/game/AI/ScriptedAI | |
| parent | a31f79d7def0f3cdd0ff11272ed810ce2df1bff2 (diff) | |
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
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 |