Prevent the Up sound playing twice during HtH->weapon switch

OpenMW · Mar 10, 2018 · bd05d32 · bd05d32
1 parent b529037
commit bd05d32
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
@@ -1180,6 +1180,12 @@ bool CharacterController::updateWeaponState()
             downSoundId = mPreviousWeapon.getClass().getDownSoundId(mPreviousWeapon);
         }
 
+        // HtH->weapon switch: there is no need to play up sound - it comes from ActionEquip
+        if(weapon != inv.end() && mWeaponType == WeapType_HandToHand && weaptype != WeapType_Spell)
+        {
+            upSoundId = "";
+        }
+
         mPreviousWeapon = weapon != inv.end() ? *weapon : MWWorld::Ptr();
     }