From 951c440c8b7bb200a7631e92b0d831c65dfc38fb Mon Sep 17 00:00:00 2001 From: Alexei Kotov Date: Fri, 23 Aug 2024 13:41:14 +0300 Subject: [PATCH] Don't apply normal weapon resistance twice for NPCs (#8124) --- CHANGELOG.md | 1 + apps/openmw/mwclass/npc.cpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3625b8fcc3..5d126b8846 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -189,6 +189,7 @@ Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher Bug #8097: GetEffect doesn't detect 0 magnitude spells + Bug #8124: Normal weapon resistance is applied twice for NPCs Feature #1415: Infinite fall failsafe Feature #2566: Handle NAM9 records for manual cell references Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index 2da36fd170..9fbe49451c 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -755,9 +755,6 @@ namespace MWClass if (!object.isEmpty()) stats.setLastHitObject(object.getCellRef().getRefId()); - if (damage > 0.0f && !object.isEmpty()) - MWMechanics::resistNormalWeapon(ptr, attacker, object, damage); - if (damage < 0.001f) damage = 0;