Merge pull request #2451 from Capostrophic/sounds

Fix combat sound inconsistencies (bugs #5092, #5093)

CHANGELOG.md

@@ -112,6 +112,8 @@
     Bug #5074: Paralyzed actors greet the player
     Bug #5075: Enchanting cast style can be changed if there's no object
     Bug #5082: Scrolling with controller in GUI mode is broken
+    Bug #5092: NPCs with enchanted weapons play sound when out of charges
+    Bug #5093: Hand to hand sound plays on knocked out enemies
     Feature #1774: Handle AvoidNode
     Feature #2229: Improve pathfinding AI
     Feature #3025: Analogue gamepad movement controls

apps/openmw/mwmechanics/combat.cpp

@@ -441,7 +441,7 @@ namespace MWMechanics
             if(sound)
                 sndMgr->playSound3D(victim, sound->mId, 1.0f, 1.0f);
         }
-        else
+        else if (!healthdmg)
             sndMgr->playSound3D(victim, "Hand To Hand Hit", 1.0f, 1.0f);
     }
 

apps/openmw/mwmechanics/spellcasting.cpp

@@ -838,21 +838,24 @@ namespace MWMechanics
             if (item.getCellRef().getEnchantmentCharge() < castCost)
             {
                 if (mCaster == getPlayer())
+                {
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicInsufficientCharge}");
 
-                // Failure sound
-                int school = 0;
-                if (!enchantment->mEffects.mList.empty())
-                {
-                    short effectId = enchantment->mEffects.mList.front().mEffectID;
-                    const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
-                    school = magicEffect->mData.mSchool;
+                    // Failure sound
+                    int school = 0;
+                    if (!enchantment->mEffects.mList.empty())
+                    {
+                        short effectId = enchantment->mEffects.mList.front().mEffectID;
+                        const ESM::MagicEffect* magicEffect = MWBase::Environment::get().getWorld()->getStore().get<ESM::MagicEffect>().find(effectId);
+                        school = magicEffect->mData.mSchool;
+                    }
+
+                    static const std::string schools[] = {
+                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+                    };
+                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                    sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
                 }
-                static const std::string schools[] = {
-                    "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                };
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
                 return false;
             }
             // Reduce charge