mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-06 00:55:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fatiguecrit' into 'master'

Browse Source 
Only play critical hit sound for health damage (#8207)

Closes #8207

See merge request OpenMW/openmw!4427
This commit is contained in:
psi29a 2024-10-28 09:53:58 +00:00
commit 891bb67ac5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

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

7
apps/openmw/mwclass/npc.cpp
View File

@ -671,8 +671,11 @@ namespace MWClass
{ {
damage *= store.find("fCombatCriticalStrikeMult")->mValue.getFloat(); damage *= store.find("fCombatCriticalStrikeMult")->mValue.getFloat();
MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}");
MWBase::Environment::get().getSoundManager()->playSound3D( if (healthdmg)
victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f); {
MWBase::Environment::get().getSoundManager()->playSound3D(
victim, ESM::RefId::stringRefId("critical damage"), 1.0f, 1.0f);
}
} }
} }