summaryrefslogtreecommitdiffstats
path: root/src/audio/MusicManager.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-11 18:53:15 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-11 18:53:15 +0100
commita223157000fac3ba63699f04bc9e466f53a412e3 (patch)
tree54e1e672a564ffdb5d65e0748a86fae60f3eb895 /src/audio/MusicManager.cpp
parentof course (diff)
downloadre3-a223157000fac3ba63699f04bc9e466f53a412e3.tar
re3-a223157000fac3ba63699f04bc9e466f53a412e3.tar.gz
re3-a223157000fac3ba63699f04bc9e466f53a412e3.tar.bz2
re3-a223157000fac3ba63699f04bc9e466f53a412e3.tar.lz
re3-a223157000fac3ba63699f04bc9e466f53a412e3.tar.xz
re3-a223157000fac3ba63699f04bc9e466f53a412e3.tar.zst
re3-a223157000fac3ba63699f04bc9e466f53a412e3.zip
Diffstat (limited to '')
-rw-r--r--src/audio/MusicManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index 098b2fc3..2a16dc14 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -160,8 +160,8 @@ cMusicManager::SetStartingTrackPositions(uint8 isNewGameTimer)
if (i < STREAMED_SOUND_CITY_AMBIENT && isNewGameTimer)
m_aTracks[i].m_nPosition = NewGameRadioTimers[i];
- else if (i < STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED)
- m_aTracks[i].m_nPosition = (pos * AudioManager.GetRandomNumber(i % 5)) % m_aTracks[i].m_nLength;
+ //else if (i < STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED)
+ // m_aTracks[i].m_nPosition = (pos * AudioManager.GetRandomNumber(i % 5)) % m_aTracks[i].m_nLength;
else
m_aTracks[i].m_nPosition = 0;
@@ -658,7 +658,7 @@ cMusicManager::ServiceGameMode()
}
if (vehicle == nil)
{
- m_nFrontendTrack = STREAMED_SOUND_RADIO_WAVE; // huh?
+ m_nFrontendTrack = STREAMED_SOUND_RADIO_LCFR; // huh?
return;
}
if (m_bRadioSetByScript)
@@ -712,7 +712,7 @@ cMusicManager::SetUpCorrectAmbienceTrack()
else if (TheCamera.DistanceToWater <= 90.0f) {
if (CCullZones::bAtBeachForAudio) {
if (CWeather::OldWeatherType != WEATHER_HURRICANE && CWeather::NewWeatherType != WEATHER_HURRICANE || CWeather::Wind <= 1.0f)
- m_nFrontendTrack = STREAMED_SOUND_BEACH_AMBIENT;
+ m_nFrontendTrack = STREAMED_SOUND_SAWMILL;
else
m_nFrontendTrack = STREAMED_SOUND_HAVANA_BEACH_AMBIENT;
}