summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioLogic.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-29 00:59:20 +0200
committerSergeanur <s.anureev@yandex.ua>2021-07-29 00:59:20 +0200
commitb77d93ba4a7a7bc0205d40aa7e716545962fe355 (patch)
tree9e373280ced5a538e354d56d7b4de9c955342262 /src/audio/AudioLogic.cpp
parentMerge branch 'miami' into lcs (diff)
parentReverse unused audio functions (diff)
downloadre3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar.gz
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar.bz2
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar.lz
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar.xz
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.tar.zst
re3-b77d93ba4a7a7bc0205d40aa7e716545962fe355.zip
Diffstat (limited to 'src/audio/AudioLogic.cpp')
-rw-r--r--src/audio/AudioLogic.cpp41
1 files changed, 40 insertions, 1 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 2a83139e..dfce9b71 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -5418,7 +5418,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, uint16 sound)
case MI_SPECIAL18:
case MI_SPECIAL19:
case MI_SPECIAL20:
- case MI_SPECIAL21: //GetSpecialCharacterTalkSfx(ped, sound)
+ case MI_SPECIAL21: //return GetSpecialCharacterTalkSfx(ped, ped->GetModelIndex(), sound);
return NO_SAMPLE;
default: return GetGenericMaleTalkSfx(ped, sound);
}
@@ -7811,6 +7811,28 @@ cAudioManager::GetWMYJGTalkSfx(CPed *ped, uint16 sound)
}
*/
+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)
{
@@ -11298,6 +11320,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)
{