StaticFlags: Implement CANNOT_TURN

Closes #536
cmangos · Oct 7, 2024 · 91b32fd · 91b32fd
1 parent 65d9086
commit 91b32fd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -909,6 +909,8 @@ class Creature : public Unit
 
         virtual uint32 GetDuration() const { return 0; }
 
+        virtual bool CannotTurn() const override { return m_settings.HasFlag(CreatureStaticFlags3::CANNOT_TURN); }
+
     protected:
         bool CreateFromProto(uint32 dbGuid, uint32 guidlow, CreatureInfo const* cinfo, const CreatureData* data = nullptr, GameEventCreatureData const* eventData = nullptr);
         bool InitEntry(uint32 Entry, const CreatureData* data = nullptr, GameEventCreatureData const* eventData = nullptr);

diff --git a/src/game/Entities/CreatureSettings.cpp b/src/game/Entities/CreatureSettings.cpp
@@ -56,6 +56,8 @@ void CreatureSettings::ResetStaticFlags(CreatureStaticFlags staticFlags, Creatur
         m_owner->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_DO_NOT_FADE_IN);
     if (HasFlag(CreatureStaticFlags3::SPELL_CLICK_FOR_PARTY_ONLY))
         m_owner->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_SPELL_CLICK_IN_GROUP);
+    if (HasFlag(CreatureStaticFlags3::CANNOT_TURN))
+        m_owner->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_CANNOT_TURN);
 }
 
 void CreatureSettings::SetFlag(CreatureStaticFlags flag)

diff --git a/src/game/Entities/Unit.h b/src/game/Entities/Unit.h
@@ -2640,6 +2640,8 @@ class Unit : public WorldObject
         void SetRootVehicle(const ObjectGuid& guid) { m_rootVehicle = guid; }
         const ObjectGuid& GetRootVehicle() const { return m_rootVehicle; }
 
+        virtual bool CannotTurn() const { return false; }
+
     protected:
         bool MeetsSelectAttackingRequirement(Unit* target, SpellEntry const* spellInfo, uint32 selectFlags, SelectAttackingTargetParams params, int32 unitConditionId) const;
 

diff --git a/src/game/MotionGenerators/TargetedMovementGenerator.cpp b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
@@ -934,8 +934,10 @@ bool FollowMovementGenerator::_getOrientation(Unit& owner, float& o) const
 {
     if (!i_target.isValid())
         return false;
-
-    o = (i_faceTarget ? owner.GetAngle(i_target.getTarget()) : i_target->GetOrientation());
+    if (owner.CannotTurn())
+        o = owner.GetOrientation();
+    else
+        o = (i_faceTarget ? owner.GetAngle(i_target.getTarget()) : i_target->GetOrientation());
     return true;
 }