diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-07-09 23:06:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 23:06:16 +0200 |
| commit | 30723cf723a6b866c158b9f721f5a3dd01a5d95c (patch) | |
| tree | 4f4cfd03c6eabfe9ef860c762570760fdedb5f90 /src/audio | |
| parent | Merge pull request #653 from Domiiniik/miami (diff) | |
| parent | VC fighting, Peds, many fixes including ghost bikes (diff) | |
| download | re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.gz re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.bz2 re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.lz re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.xz re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.tar.zst re3-30723cf723a6b866c158b9f721f5a3dd01a5d95c.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 |