diff options
Diffstat (limited to 'src/audio/AudioManager.h')
| -rw-r--r-- | src/audio/AudioManager.h | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 450a8818..2f89ea6a 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -290,18 +290,21 @@ public: uint32 GetMedicTalkSfx(CPed *ped, int16 sound); uint32 GetFiremanTalkSfx(CPed *ped, int16 sound); uint32 GetDefaultTalkSfx(CPed *ped, int16 sound); - uint32 GetHFYSTTalkSfx(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 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 GetHMOBETalkSfx(CPed *ped, int16 sound); uint32 GetHFYBUTalkSfx(CPed *ped, int16 sound); uint32 GetHFYMDTalkSfx(CPed *ped, int16 sound); uint32 GetHFYCGTalkSfx(CPed *ped, int16 sound); @@ -318,7 +321,7 @@ public: 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 GetBMYRITalkSfx(CPed *ped, int16 sound); uint32 GetBFYBETalkSfx(CPed *ped, int16 sound); uint32 GetBMYBETalkSfx(CPed *ped, int16 sound); uint32 GetBFOBETalkSfx(CPed *ped, int16 sound); @@ -347,33 +350,33 @@ public: 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 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 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) @@ -565,8 +568,9 @@ public: #define SET_LOOP_OFFSETS(sample) #endif -#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS) -static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); -#endif +//#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS) +//static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); +//#endif + extern cAudioManager AudioManager; |