summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-28 08:24:23 +0200
committerSergeanur <s.anureev@yandex.ua>2021-07-28 08:24:23 +0200
commit7adc85995f172efc59483c9d2e2966ee0ebf2a0f (patch)
tree21822ed1d369a8e43888e70e58a6e7df872d266d /src/audio/AudioManager.h
parentMerge branch 'miami' into lcs (diff)
parentPed comments ordering and type fix + vice function(s) fix (diff)
downloadre3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar.gz
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar.bz2
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar.lz
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar.xz
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.tar.zst
re3-7adc85995f172efc59483c9d2e2966ee0ebf2a0f.zip
Diffstat (limited to 'src/audio/AudioManager.h')
-rw-r--r--src/audio/AudioManager.h198
1 files changed, 98 insertions, 100 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 2f89ea6a..28623f95 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -282,104 +282,102 @@ public:
// functions returning talk sfx,
// order from GetPedCommentSfx
- uint32 GetPlayerTalkSfx(CPed *ped, int16 sound);
- uint32 GetCopTalkSfx(CPed *ped, int16 sound);
- uint32 GetSwatTalkSfx(CPed *ped, int16 sound);
- uint32 GetFBITalkSfx(CPed *ped, int16 sound);
- uint32 GetArmyTalkSfx(CPed *ped, int16 sound);
- uint32 GetMedicTalkSfx(CPed *ped, int16 sound);
- uint32 GetFiremanTalkSfx(CPed *ped, int16 sound);
- uint32 GetDefaultTalkSfx(CPed *ped, int16 sound);
-
- // LCS: Do not delete, some of these are still used
-
- //uint32 GetHFYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetHMYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetHMOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetHFORITalkSfx(CPed *ped, int16 sound);
- uint32 GetHMYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetHMORITalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYBETalkSfx(CPed *ped, int16 sound);
- uint32 GetHFOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetHMYBETalkSfx(CPed *ped, int16 sound);
- //uint32 GetHMOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFYPRTalkSfx(CPed *ped, int16 sound);
- uint32 GetHFOTRTalkSfx(CPed *ped, int16 sound);
- uint32 GetHMOTRTalkSfx(CPed *ped, int16 sound);
- uint32 GetHMYAPTalkSfx(CPed *ped, int16 sound);
- uint32 GetHMOCATalkSfx(CPed *ped, int16 sound);
- uint32 GetBMODKTalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYCRTalkSfx(CPed *ped, int16 sound);
- uint32 GetBFYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetBFOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetBMOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetBFYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetBFORITalkSfx(CPed *ped, int16 sound);
- //uint32 GetBMYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetBFYBETalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYBETalkSfx(CPed *ped, int16 sound);
- uint32 GetBFOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetBMOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYBUTalkSfx(CPed *ped, int16 sound);
- uint32 GetBFYPRTalkSfx(CPed *ped, int16 sound);
- uint32 GetBFOTRTalkSfx(CPed *ped, int16 sound);
- uint32 GetBMOTRTalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYPITalkSfx(CPed *ped, int16 sound);
- uint32 GetBMYBBTalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYCRTalkSfx(CPed *ped, int16 sound);
- uint32 GetWFYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetWFOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetWMOSTTalkSfx(CPed *ped, int16 sound);
- uint32 GetWFYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetWFORITalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYRITalkSfx(CPed *ped, int16 sound);
- uint32 GetWMORITalkSfx(CPed *ped, int16 sound);
- uint32 GetWFYBETalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYBETalkSfx(CPed *ped, int16 sound);
- uint32 GetWFOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetWMOBETalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYCWTalkSfx(CPed *ped, int16 sound);
- uint32 GetWMYGOTalkSfx(CPed *ped, int16 sound);
- uint32 GetWFOGOTalkSfx(CPed *ped, int16 sound);
- uint32 GetWMOGOTalkSfx(CPed *ped, int16 sound);
- uint32 GetWFYLGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMYLGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYBUTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMYBUTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMOBUTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYPRTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFOTRTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMOTRTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMYPITalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMOCATalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYJGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMYJGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYSKTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWMYSKTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYSHTalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFOSHTalkSfx(CPed *ped, int16 sound);
- uint32 GetJFOTOTalkSfx(CPed *ped, int16 sound);
- uint32 GetJMOTOTalkSfx(CPed *ped, int16 sound);
- //uint32 GetCBTalkSfx(CPed *ped, int16 sound);
- //uint32 GetHNTalkSfx(CPed *ped, int16 sound);
- //uint32 GetSGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetCLTalkSfx(CPed *ped, int16 sound);
- //uint32 GetGDTalkSfx(CPed *ped, int16 sound);
- //uint32 GetBKTalkSfx(CPed *ped, int16 sound);
- //uint32 GetPGTalkSfx(CPed *ped, int16 sound);
- //uint32 GetVICETalkSfx(CPed *ped, int16 sound, int16 model);
- //uint32 GetWFYG1TalkSfx(CPed *ped, int16 sound);
- //uint32 GetWFYG2TalkSfx(CPed *ped, int16 sound);
-
- uint32 GetGenericMaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
- uint32 GetGenericFemaleTalkSfx(CPed *ped, int16 sound); // todo names (inlined in vc)
+ uint32 GetPlayerTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetCopTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetSwatTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetFBITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetArmyTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetMedicTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetFiremanTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetDefaultTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFORITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMORITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYBUTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYMDTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYCGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFYPRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHFOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMYAPTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHMOCATalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMODKTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYCRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFORITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYBUTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFYPRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBFOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYPITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBMYBBTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYCRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOSTTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFORITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYRITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMORITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOBETalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYCWTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYGOTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFOGOTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOGOTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYLGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYLGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYBUTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYBUTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOBUTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYPRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOTRTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYPITalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMOCATalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYJGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYJGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYSKTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWMYSKTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYSHTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFOSHTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetJFOTOTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetJMOTOTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetCBTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetHNTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetSGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetCLTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetGDTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetBKTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetPGTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetViceWhiteTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetViceBlackTalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYG1TalkSfx(CPed *ped, uint16 sound);
+ uint32 GetWFYG2TalkSfx(CPed *ped, uint16 sound);
+
+ uint32 GetGenericMaleTalkSfx(CPed *ped, uint16 sound); // todo names (inlined in vc)
+ uint32 GetGenericFemaleTalkSfx(CPed *ped, uint16 sound); // todo names (inlined in vc)
// end of functions returning talk sfx
void GenerateIntegerRandomNumberTable();
@@ -395,8 +393,8 @@ public:
uint8 GetMissionAudioLoadingStatus(uint8 slot);
int8 GetMissionScriptPoliceAudioPlayingStatus();
uint8 GetNum3DProvidersAvailable();
- uint32 GetPedCommentSfx(CPed *ped, int32 sound);
- void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset) const;
+ uint32 GetPedCommentSfx(CPed *ped, uint16 sound);
+ void GetPhrase(uint32 &phrase, uint32 &prevPhrase, uint32 sample, uint32 maxOffset);
float GetVehicleDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, float gasPedalAudio, cTransmission *transmission,
float velocityChange);
float GetVehicleNonDriveWheelSkidValue(CVehicle *veh, tWheelState wheelState, cTransmission *transmission, float velocityChange);