diff options
| author | aap <aap@papnet.eu> | 2021-01-08 01:41:40 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-08 01:41:40 +0100 |
| commit | ebdf08a5144fa98fd5a0700c4865d7c6673d947e (patch) | |
| tree | a239d268f61711c158583f9bc515f012b4c3fb8e /src/audio | |
| parent | Add support of PS2 audio streams to OpenAL (diff) | |
| download | re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.gz re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.bz2 re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.lz re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.xz re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.tar.zst re3-ebdf08a5144fa98fd5a0700c4865d7c6673d947e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/AudioLogic.cpp | 5 | ||||
| -rw-r--r-- | src/audio/MusicManager.cpp | 2 | ||||
| -rw-r--r-- | src/audio/PoliceRadio.cpp | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 01b33fa5..53483ae1 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5296,6 +5296,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) case MI_MEDIC: return GetMedicTalkSfx(ped, sound); case MI_FIREMAN: return GetFiremanTalkSfx(ped, sound); case MI_MALE01: return GetDefaultTalkSfx(ped, sound); +/* LCS: removed for now case MI_HFYST: return GetHFYSTTalkSfx(ped, sound); case MI_HFOST: return GetHFOSTTalkSfx(ped, sound); case MI_HMYST: return GetHMYSTTalkSfx(ped, sound); @@ -5384,6 +5385,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound) case MI_BKB: return GetBKTalkSfx(ped, sound); case MI_PGA: case MI_PGB: return GetPGTalkSfx(ped, sound); +*/ case MI_VICE1: case MI_VICE2: case MI_VICE3: @@ -7567,7 +7569,8 @@ cAudioManager::GetSGTalkSfx(CPed *ped, int16 sound) case SOUND_PED_CHAT: GetPhrase(sfx, ped->m_lastComment, 1064, 12); break; default: return GetGenericMaleTalkSfx(ped, sound); } - if(ped->GetModelIndex() == MI_SGB) sfx += 93; +// LCS removed for now +// if(ped->GetModelIndex() == MI_SGB) sfx += 93; return sfx; } diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp index acfe09c3..098b2fc3 100644 --- a/src/audio/MusicManager.cpp +++ b/src/audio/MusicManager.cpp @@ -1295,7 +1295,7 @@ cMusicManager::UsesPoliceRadio(CVehicle *veh) bool cMusicManager::UsesTaxiRadio(CVehicle *veh) { - if (veh->GetModelIndex() != MI_KAUFMAN) return false; + if (veh->GetModelIndex() != MI_CABBIE) return false; return CTheScripts::bPlayerHasMetDebbieHarry; } diff --git a/src/audio/PoliceRadio.cpp b/src/audio/PoliceRadio.cpp index 30fcbde0..07dfb890 100644 --- a/src/audio/PoliceRadio.cpp +++ b/src/audio/PoliceRadio.cpp @@ -546,8 +546,7 @@ cAudioManager::SetupSuspectLastSeenReport() break; case MI_TAXI: case MI_CABBIE: - case MI_ZEBRA: - case MI_KAUFMAN: + case MI_BORGNINE: sample = SFX_POLICE_RADIO_TAXI; break; case MI_BOBCAT: |