Skip to content

Commit 891bb67

Browse files
committed
Merge branch 'fatiguecrit' into 'master'
Only play critical hit sound for health damage (#8207) Closes #8207 See merge request OpenMW/openmw!4427
2 parents 7bbb1bf + 71f6341 commit 891bb67

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@
198198
Bug #8172: Openmw-cs crashes when viewing `Dantooine, Sea`
199199
Bug #8187: Intervention effects should use Chebyshev distance to determine the closest marker
200200
Bug #8191: NiRollController does not work for sheath meshes
201+
Bug #8207: Using hand-to-hand while sneaking plays the critical hit sound when the target is not getting hurt
201202
Feature #1415: Infinite fall failsafe
202203
Feature #2566: Handle NAM9 records for manual cell references
203204
Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking

apps/openmw/mwclass/npc.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,11 @@ namespace MWClass
671671
{
672672
damage *= store.find("fCombatCriticalStrikeMult")->mValue.getFloat();
673673
MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}");
674-
MWBase::Environment::get().getSoundManager()->playSound3D(
675-
victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f);
674+
if (healthdmg)
675+
{
676+
MWBase::Environment::get().getSoundManager()->playSound3D(
677+
victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f);
678+
}
676679
}
677680
}
678681

0 commit comments

Comments
 (0)