diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-21 10:55:39 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-21 10:55:39 +0200 |
| commit | 7cc3410846796a7bb0946384c7e22652f2bb60e6 (patch) | |
| tree | 0b3d6d0675c44c21c83541f9f9c71e6244c6cf06 /src/audio/AudioCollision.cpp | |
| parent | Merge remote-tracking branch 'upstream/master' (diff) | |
| parent | librw skin pipe (diff) | |
| download | re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar.gz re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar.bz2 re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar.lz re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar.xz re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.tar.zst re3-7cc3410846796a7bb0946384c7e22652f2bb60e6.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/AudioCollision.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/audio/AudioCollision.cpp b/src/audio/AudioCollision.cpp index ac8e04c3..a963b293 100644 --- a/src/audio/AudioCollision.cpp +++ b/src/audio/AudioCollision.cpp @@ -226,7 +226,7 @@ cAudioManager::SetUpOneShotCollisionSound(cAudioCollision *col) if(s1 == SURFACE_METAL6 && s2 == SURFACE_FLESH) ratio = 0.25f * ratio; if(s1 == SURFACE_METAL6 && ratio < 0.6f) { s1 = SURFACE_BILLBOARD; - ratio = min(1.f, 2.f * ratio); + ratio = Min(1.f, 2.f * ratio); } emittingVol = 40.f * ratio; if(emittingVol) { |