From 3df695df4a0f393a534736b558dc02cad983bcf7 Mon Sep 17 00:00:00 2001 From: Aussiemon Date: Tue, 15 Apr 2025 18:38:53 -0600 Subject: [PATCH] Found better place for early return --- apps/openmw/mwmechanics/aicombat.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp index a96270c2e3..82fc9a67a1 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -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; @@ -245,9 +249,7 @@ namespace MWMechanics float distToTarget = getDistanceToBounds(actor, target); - // Must be attacking, within range, have line of sight, and not be immobile - storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack && storage.mLOS - && actor.getClass().isMobile(actor)); + storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack && storage.mLOS); if (isRangedCombat) {