Merge branch 'KwarmaQueenCombat' into 'master'

Prevent immobile creatures from attacking or rotating, but not entering combat

Closes #7871

See merge request OpenMW/openmw!4632

apps/openmw/mwclass/creature.cpp

@@ -360,16 +360,12 @@ namespace MWClass
         {
             stats.setAttacked(true);
 
-            // No retaliation for totally static creatures (they have no movement or attacks anyway)
-            if (isMobile(ptr))
-            {
-                bool complain = sourceType == MWMechanics::DamageSourceType::Melee;
-                bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged;
-                if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain))
-                    setOnPcHitMe = false;
-                else
-                    setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
-            }
+            bool complain = sourceType == MWMechanics::DamageSourceType::Melee;
+            bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged;
+            if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain))
+                setOnPcHitMe = false;
+            else
+                setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
         }
 
         // Attacker and target store each other as hitattemptactor if they have no one stored yet

apps/openmw/mwmechanics/actors.cpp

@@ -605,10 +605,6 @@ namespace MWMechanics
     void Actors::engageCombat(
         const MWWorld::Ptr& actor1, const MWWorld::Ptr& actor2, SidingCache& cachedAllies, bool againstPlayer) const
     {
-        // No combat for totally static creatures
-        if (!actor1.getClass().isMobile(actor1))
-            return;
-
         CreatureStats& creatureStats1 = actor1.getClass().getCreatureStats(actor1);
         if (creatureStats1.isDead() || creatureStats1.getAiSequence().isInCombat(actor2))
             return;

apps/openmw/mwmechanics/aicombat.cpp

@@ -104,10 +104,10 @@ namespace MWMechanics
     bool AiCombat::execute(
         const MWWorld::Ptr& actor, CharacterController& characterController, AiState& state, float duration)
     {
-        // get or create temporary storage
+        // Get or create temporary storage
         AiCombatStorage& storage = state.get<AiCombatStorage>();
 
-        // General description
+        // No combat for dead creatures
         if (actor.getClass().getCreatureStats(actor).isDead())
             return true;
 
@@ -231,6 +231,10 @@ namespace MWMechanics
                 storage.stopFleeing();
         }
 
+        // No attack actions for totally static creatures
+        if (!actor.getClass().isMobile(actor))
+            return false;
+
         bool isRangedCombat = false;
         float& rangeAttack = storage.mAttackRange;
 

apps/openmw/mwmechanics/aipackage.cpp

@@ -135,6 +135,10 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     MWWorld::MovementDirectionFlags supportedMovementDirections, float destTolerance, float endTolerance,
     PathType pathType)
 {
+    // No pathing for totally static creatures
+    if (!actor.getClass().isMobile(actor))
+        return false;
+
     const Misc::TimerStatus timerStatus = mReaction.update(duration);
 
     const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); // position of the actor