diff options
author | Sergeanur <s.anureev@yandex.ua> | 2021-07-29 00:52:49 +0200 |
---|---|---|
committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-29 00:52:49 +0200 |
commit | 7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab (patch) | |
tree | 40a032476478e7009e26fb85d78f7f27a15cca34 /src/audio/AudioLogic.cpp | |
parent | Reverse unused audio functions from mobile (diff) | |
download | re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar.gz re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar.bz2 re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar.lz re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar.xz re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.tar.zst re3-7bacf3b6f48aa5c46079c8019963f47a1e7cf9ab.zip |
Diffstat (limited to 'src/audio/AudioLogic.cpp')
-rw-r--r-- | src/audio/AudioLogic.cpp | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 83f55d33..56463be0 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -5367,7 +5367,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, uint16 sound) case MI_SPECIAL18: case MI_SPECIAL19: case MI_SPECIAL20: - case MI_SPECIAL21: return NO_SAMPLE; + case MI_SPECIAL21: return GetSpecialCharacterTalkSfx(ped, ped->GetModelIndex(), sound); default: return GetGenericMaleTalkSfx(ped, sound); } } @@ -7794,6 +7794,28 @@ cAudioManager::GetWMYJGTalkSfx(CPed *ped, uint16 sound) return sfx; } +uint32 +cAudioManager::GetSpecialCharacterTalkSfx(CPed *ped, int32 model, uint16 sound) +{ + return NO_SAMPLE; +} + +void +cAudioManager::DebugPlayPedComment(int32 sound) +{ + tPedComment pedComment; + + pedComment.m_nSampleIndex = sound; + pedComment.m_nProcess = 10; + pedComment.m_nEntityIndex = 0; + pedComment.m_fDistance = 0.0f; + pedComment.m_bVolume = 99; + + pedComment.m_vecPos = CWorld::Players[0].m_pPed->GetPosition(); + + m_sPedComments.Add(&pedComment); +} + void cPedComments::Add(tPedComment *com) { @@ -9786,6 +9808,23 @@ FindMissionAudioSfx(const char *name) return NO_SAMPLE; } +const char * +cAudioManager::GetMissionAudioLoadedLabel(uint8 slot) +{ + if (m_bIsInitialised && slot < MISSION_AUDIO_SLOTS && m_sMissionAudio.m_nSampleIndex[slot] != NO_SAMPLE) { + for (uint32 i = 0; MissionAudioNameSfxAssoc[i].m_pName != nil; ++i) { + if (m_sMissionAudio.m_nSampleIndex[slot] == MissionAudioNameSfxAssoc[i].m_nId) + return MissionAudioNameSfxAssoc[i].m_pName; + } + } + +#ifdef THIS_IS_STUPID + return MissionAudioNameSfxAssoc[0].m_pName; // yeah this is dumb +#else + return ""; +#endif +} + bool8 cAudioManager::MissionScriptAudioUsesPoliceChannel(uint32 soundMission) { |