diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-03-26 18:59:44 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-26 18:59:44 +0100 |
| commit | 4eba9786708dd3b22d9053c1a14eac7e6d03242e (patch) | |
| tree | f68dcd89c7b41d3b403facb0a0fa7fd1fdb1eedf /src/server/game/AI/ScriptedAI | |
| parent | ad30c22902a23996f805f74851aef58935c56a6e (diff) | |
Core/Misc: Rename SetXXXFlags updatefield functions to ReplaceAllXXXFlags
Diffstat (limited to 'src/server/game/AI/ScriptedAI')
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index c305a5e3f6f..c219d459cb1 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -319,8 +319,8 @@ void EscortAI::Start(bool isActiveAttacker /* = true*/, bool run /* = false */, me->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL); // disable npcflags - me->SetNpcFlags(UNIT_NPC_FLAG_NONE); - me->SetNpcFlags2(UNIT_NPC_FLAG_2_NONE); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); + me->ReplaceAllNpcFlags2(UNIT_NPC_FLAG_2_NONE); if (me->IsImmuneToNPC()) { _hasImmuneToNPCFlags = true; diff --git a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp index 3ae0f5e0c94..41a63754262 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp @@ -184,8 +184,8 @@ void FollowerAI::StartFollow(Player* player, uint32 factionForFollower, uint32 q me->GetMotionMaster()->Clear(MOTION_PRIORITY_NORMAL); me->PauseMovement(); - me->SetNpcFlags(UNIT_NPC_FLAG_NONE); - me->SetNpcFlags2(UNIT_NPC_FLAG_2_NONE); + me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE); + me->ReplaceAllNpcFlags2(UNIT_NPC_FLAG_2_NONE); AddFollowState(STATE_FOLLOW_INPROGRESS); |