diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-08 16:26:23 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-09 16:01:07 +0200 |
| commit | 67a3c7d2ee2787b254099bf22a9c261146ce5eed (patch) | |
| tree | 70124341489b7293a9d4eccfe2d74df263ab5e3e /src/audio | |
| parent | Merge pull request #652 from Domiiniik/miami (diff) | |
| download | re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.gz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.bz2 re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.lz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.xz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.zst re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 2 | ||||
| -rw-r--r-- | src/audio/MusicManager.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 0c36cf17..871d13dc 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5724,6 +5724,8 @@ cAudioManager::ClearMissionAudio(uint8 slot) m_sMissionAudio.m_bIsPlayed[slot] = false; m_sMissionAudio.m_bPredefinedProperties[slot] = true; m_sMissionAudio.m_nMissionAudioCounter[slot] = 0; + m_sMissionAudio.m_bIsMobile[slot] = false; + SampleManager.StopStreamedFile(slot + 1); } } diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index 9fb1991e..ae2e97ac 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -714,15 +714,17 @@ cMusicManager::UsesPoliceRadio(CVehicle *veh) { switch (veh->GetModelIndex()) { - case MI_FBICAR: - case MI_POLICE: - case MI_ENFORCER: - case MI_PREDATOR: + case MI_VCNMAV: + case MI_POLMAV: + case MI_COASTG: case MI_RHINO: case MI_BARRACKS: return true; + case MI_MRWHOOP: + case MI_HUNTER: + return false; } - return false; + return veh->UsesSiren(); } void |