summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-03 15:43:58 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-03 15:43:58 +0100
commit2e06e4b6b872343616a7b9d41373d1812cb25b95 (patch)
tree14007f10146231084a720b8a8a73c0f2dd95c74a /src
parentPed: PlayerPed: fixes (diff)
downloadre3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar.gz
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar.bz2
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar.lz
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar.xz
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.tar.zst
re3-2e06e4b6b872343616a7b9d41373d1812cb25b95.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/AudioManager.cpp7
-rw-r--r--src/audio/MusicManager.cpp2
2 files changed, 6 insertions, 3 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index d441b750..0ab2222c 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -17,12 +17,15 @@ const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1;
const int allChannels = channels + 2;
+#define SPEED_OF_SOUND 343.f
+#define TIME_SPENT 40
+
cAudioManager::cAudioManager()
{
m_bIsInitialised = false;
m_bReverb = true;
- m_fSpeedOfSound = 6.86f;
- m_nTimeSpent = 50;
+ m_fSpeedOfSound = SPEED_OF_SOUND / TIME_SPENT;
+ m_nTimeSpent = TIME_SPENT;
m_nActiveSamples = NUM_SOUNDS_SAMPLES_SLOTS;
m_nActiveSampleQueue = 1;
ClearRequestedQueue();
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index d23105ee..acfe09c3 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -435,7 +435,7 @@ cMusicManager::ServiceFrontEndMode()
else {
if (m_nCurrentVolume < m_nMaxVolume)
m_nCurrentVolume = Min(m_nMaxVolume, m_nCurrentVolume + 6);
- SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63u, 0, 0);
+ SampleManager.SetStreamedVolumeAndPan(m_nCurrentVolume, 63, 0, 0);
}
} else {
if (m_nPlayingTrack == STREAMED_SOUND_RADIO_MP3_PLAYER)