summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioCollision.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:46:47 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-08-08 14:46:47 +0200
commit74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd (patch)
treeebe621b0d748a1a8854760cdfbd227ce7d93d164 /src/audio/AudioCollision.cpp
parentmerge (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.gz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.bz2
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.lz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.xz
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.tar.zst
re3-74f00c3c6362f1fe7ee9d25a99ee8db5ce4e88dd.zip
Diffstat (limited to 'src/audio/AudioCollision.cpp')
-rw-r--r--src/audio/AudioCollision.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/audio/AudioCollision.cpp b/src/audio/AudioCollision.cpp
index ed705b7d..d94d99ea 100644
--- a/src/audio/AudioCollision.cpp
+++ b/src/audio/AudioCollision.cpp
@@ -178,9 +178,8 @@ static const int32 gOneShotCol[] = {SFX_COL_TARMAC_1,
void
cAudioManager::SetUpOneShotCollisionSound(const cAudioCollision &col)
{
-
- int16 s1;
- int16 s2;
+ uint16 s1;
+ uint16 s2;
int32 emittingVol;
float ratio;