Merge branch 'throwingweaponswish' into 'master'

Re-enable swish sound for throwing weapons (#8926)

Closes #8926

See merge request OpenMW/openmw!5106

Author: Capostrophic

apps/openmw/mwmechanics/character.cpp

@@ -1256,11 +1256,14 @@ namespace MWMechanics
         if (mAttackStrength == -1.f)
             mAttackStrength = std::min(1.f, 0.1f + Misc::Rng::rollClosedProbability(prng));
         ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
-        if (weapclass != ESM::WeaponType::Ranged && weapclass != ESM::WeaponType::Thrown)
+        if (weapclass != ESM::WeaponType::Ranged)
         {
-            mAttackSuccess = mPtr.getClass().evaluateHit(mPtr, mAttackVictim, mAttackHitPos);
-            if (!mAttackSuccess)
-                mAttackStrength = 0.f;
+            if (weapclass != ESM::WeaponType::Thrown)
+            {
+                mAttackSuccess = mPtr.getClass().evaluateHit(mPtr, mAttackVictim, mAttackHitPos);
+                if (!mAttackSuccess)
+                    mAttackStrength = 0.f;
+            }
             playSwishSound();
         }
 

docs/source/reference/modding/sound-effects.rst

@@ -161,7 +161,7 @@ Combat
    * - ``miss``
      - An attack misses
    * - ``weapon swish``
-     - Melee weapon attack. The sound is modulated based on attack strength.
+     - Melee or thrown weapon attack. The sound is modulated based on attack strength.
 
 
 UI