mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 18:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix swish sound volume and pitch (bug #5057)

Browse Source
This commit is contained in:
Alexei Kotov 2022-08-11 21:04:39 +03:00
parent 8e7ddc7c0d
commit 6c05192afa
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/mwmechanics/character.cpp
View File

@ -2710,8 +2710,9 @@ void CharacterController::playSwishSound() const
if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown) if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
return; return;
std::string soundId; std::string soundId = "Weapon Swish";
float pitch = 1.f; float volume = 0.98f + mAttackStrength * 0.02f;
float pitch = 0.75f + mAttackStrength * 0.4f;
const MWWorld::Class &cls = mPtr.getClass(); const MWWorld::Class &cls = mPtr.getClass();
if (cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf()) if (cls.isNpc() && cls.getNpcStats(mPtr).isWerewolf())
@ -2722,17 +2723,9 @@ void CharacterController::playSwishSound() const
if (sound) if (sound)
soundId = sound->mId; soundId = sound->mId;
} }
else
{
soundId = "Weapon Swish";
if (mAttackStrength < 0.5f)
pitch = 0.8f; // Weak attack
else if (mAttackStrength >= 1.f)
pitch = 1.2f; // Strong attack
}
if (!soundId.empty()) if (!soundId.empty())
MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, soundId, 1.0f, pitch); MWBase::Environment::get().getSoundManager()->playSound3D(mPtr, soundId, volume, pitch);
} }
void CharacterController::updateHeadTracking(float duration) void CharacterController::updateHeadTracking(float duration)