mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-23 09:39:16 +01:00
Reverse unused audio functions
This commit is contained in:
parent
cce97588fe
commit
7bacf3b6f4
@ -5367,7 +5367,7 @@ cAudioManager::GetPedCommentSfx(CPed *ped, uint16 sound)
|
|||||||
case MI_SPECIAL18:
|
case MI_SPECIAL18:
|
||||||
case MI_SPECIAL19:
|
case MI_SPECIAL19:
|
||||||
case MI_SPECIAL20:
|
case MI_SPECIAL20:
|
||||||
case MI_SPECIAL21: return NO_SAMPLE;
|
case MI_SPECIAL21: return GetSpecialCharacterTalkSfx(ped, ped->GetModelIndex(), sound);
|
||||||
default: return GetGenericMaleTalkSfx(ped, sound);
|
default: return GetGenericMaleTalkSfx(ped, sound);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -7794,6 +7794,28 @@ cAudioManager::GetWMYJGTalkSfx(CPed *ped, uint16 sound)
|
|||||||
return sfx;
|
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
|
void
|
||||||
cPedComments::Add(tPedComment *com)
|
cPedComments::Add(tPedComment *com)
|
||||||
{
|
{
|
||||||
@ -9786,6 +9808,23 @@ FindMissionAudioSfx(const char *name)
|
|||||||
return NO_SAMPLE;
|
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
|
bool8
|
||||||
cAudioManager::MissionScriptAudioUsesPoliceChannel(uint32 soundMission)
|
cAudioManager::MissionScriptAudioUsesPoliceChannel(uint32 soundMission)
|
||||||
{
|
{
|
||||||
|
@ -264,9 +264,9 @@ cAudioManager::SetMusicFadeVol(uint8 volume)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::SetMonoMode(bool8 mono)
|
cAudioManager::SetOutputMode(bool8 surround)
|
||||||
{
|
{
|
||||||
SampleManager.SetMonoMode(mono);
|
// on ps2 this calls another method of cAudioManager to set DTS mode on or off
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -530,11 +530,22 @@ cAudioManager::TranslateEntity(Const CVector *in, CVector *out)
|
|||||||
*out = MultiplyInverse(TheCamera.GetMatrix(), *in);
|
*out = MultiplyInverse(TheCamera.GetMatrix(), *in);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint8 PanTable[64] = { 0, 3, 8, 12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 49, 50, 51, 52, 53, 53,
|
||||||
|
54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
|
||||||
|
|
||||||
|
int32
|
||||||
|
cAudioManager::ComputeFrontRearMix(float dist, CVector *vec)
|
||||||
|
{
|
||||||
|
int32 index = Min(63, Abs(int32(vec->y / (dist / 64.f))));
|
||||||
|
|
||||||
|
if (vec->y > 0.f)
|
||||||
|
return Max(0, 63 - PanTable[index]);
|
||||||
|
return Min(127, PanTable[index] + 63);
|
||||||
|
}
|
||||||
|
|
||||||
int32
|
int32
|
||||||
cAudioManager::ComputePan(float dist, CVector *vec)
|
cAudioManager::ComputePan(float dist, CVector *vec)
|
||||||
{
|
{
|
||||||
const uint8 PanTable[64] = { 0, 3, 8, 12, 16, 19, 22, 24, 26, 28, 30, 31, 33, 34, 36, 37, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 49, 50, 51, 52, 53, 53,
|
|
||||||
54, 55, 55, 56, 56, 57, 57, 58, 58, 58, 59, 59, 59, 60, 60, 61, 61, 61, 61, 62, 62, 62, 62, 62, 63, 63, 63, 63, 63, 63, 63, 63};
|
|
||||||
int32 index = Min(63, Abs(int32(vec->x / (dist / 64.f))));
|
int32 index = Min(63, Abs(int32(vec->x / (dist / 64.f))));
|
||||||
|
|
||||||
if (vec->x > 0.f)
|
if (vec->x > 0.f)
|
||||||
|
@ -264,7 +264,7 @@ public:
|
|||||||
void SetMP3BoostVolume(uint8 volume);
|
void SetMP3BoostVolume(uint8 volume);
|
||||||
void SetEffectsFadeVol(uint8 volume);
|
void SetEffectsFadeVol(uint8 volume);
|
||||||
void SetMusicFadeVol(uint8 volume);
|
void SetMusicFadeVol(uint8 volume);
|
||||||
void SetMonoMode(bool8 mono);
|
void SetOutputMode(bool8 surround);
|
||||||
void ResetTimers(uint32 time);
|
void ResetTimers(uint32 time);
|
||||||
void DestroyAllGameCreatedEntities();
|
void DestroyAllGameCreatedEntities();
|
||||||
|
|
||||||
@ -287,6 +287,7 @@ public:
|
|||||||
void ServiceSoundEffects();
|
void ServiceSoundEffects();
|
||||||
uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance);
|
uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance);
|
||||||
void TranslateEntity(Const CVector *v1, CVector *v2);
|
void TranslateEntity(Const CVector *v1, CVector *v2);
|
||||||
|
int32 ComputeFrontRearMix(float, CVector *);
|
||||||
int32 ComputePan(float, CVector *);
|
int32 ComputePan(float, CVector *);
|
||||||
uint32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2, float speedMultiplier);
|
uint32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2, float speedMultiplier);
|
||||||
int32 RandomDisplacement(uint32 seed);
|
int32 RandomDisplacement(uint32 seed);
|
||||||
@ -481,6 +482,9 @@ public:
|
|||||||
uint32 GetHMYAPTalkSfx(CPed *ped, uint16 sound);
|
uint32 GetHMYAPTalkSfx(CPed *ped, uint16 sound);
|
||||||
uint32 GetWFYJGTalkSfx(CPed *ped, uint16 sound);
|
uint32 GetWFYJGTalkSfx(CPed *ped, uint16 sound);
|
||||||
uint32 GetWMYJGTalkSfx(CPed *ped, uint16 sound);
|
uint32 GetWMYJGTalkSfx(CPed *ped, uint16 sound);
|
||||||
|
uint32 GetSpecialCharacterTalkSfx(CPed *ped, int32 model, uint16 sound);
|
||||||
|
|
||||||
|
void DebugPlayPedComment(int32 sound);
|
||||||
|
|
||||||
// particles
|
// particles
|
||||||
void ProcessExplosions(int32 explosion);
|
void ProcessExplosions(int32 explosion);
|
||||||
@ -510,6 +514,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// mission audio
|
// mission audio
|
||||||
|
const char *GetMissionAudioLoadedLabel(uint8 slot);
|
||||||
bool8 MissionScriptAudioUsesPoliceChannel(uint32 soundMission);
|
bool8 MissionScriptAudioUsesPoliceChannel(uint32 soundMission);
|
||||||
void PreloadMissionAudio(uint8 slot, Const char *name);
|
void PreloadMissionAudio(uint8 slot, Const char *name);
|
||||||
uint8 GetMissionAudioLoadingStatus(uint8 slot);
|
uint8 GetMissionAudioLoadingStatus(uint8 slot);
|
||||||
|
@ -63,9 +63,9 @@ cDMAudio::DestroyAllGameCreatedEntities(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
cDMAudio::SetMonoMode(bool8 mono)
|
cDMAudio::SetOutputMode(bool8 surround)
|
||||||
{
|
{
|
||||||
AudioManager.SetMonoMode(mono);
|
return AudioManager.SetOutputMode(surround);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -321,6 +321,12 @@ cDMAudio::PlayLoadedMissionAudio(uint8 slot)
|
|||||||
AudioManager.PlayLoadedMissionAudio(slot);
|
AudioManager.PlayLoadedMissionAudio(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool8
|
||||||
|
cDMAudio::IsMissionAudioSamplePlaying(uint8 slot)
|
||||||
|
{
|
||||||
|
return AudioManager.IsMissionAudioSamplePlaying(slot);
|
||||||
|
}
|
||||||
|
|
||||||
bool8
|
bool8
|
||||||
cDMAudio::IsMissionAudioSampleFinished(uint8 slot)
|
cDMAudio::IsMissionAudioSampleFinished(uint8 slot)
|
||||||
{
|
{
|
||||||
@ -333,6 +339,12 @@ cDMAudio::ClearMissionAudio(uint8 slot)
|
|||||||
AudioManager.ClearMissionAudio(slot);
|
AudioManager.ClearMissionAudio(slot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
cDMAudio::GetMissionAudioLoadedLabel(uint8 slot)
|
||||||
|
{
|
||||||
|
return AudioManager.GetMissionAudioLoadedLabel(slot);
|
||||||
|
}
|
||||||
|
|
||||||
uint8
|
uint8
|
||||||
cDMAudio::GetRadioInCar(void)
|
cDMAudio::GetRadioInCar(void)
|
||||||
{
|
{
|
||||||
|
@ -30,7 +30,7 @@ public:
|
|||||||
void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
|
void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
|
||||||
void DestroyAllGameCreatedEntities(void);
|
void DestroyAllGameCreatedEntities(void);
|
||||||
|
|
||||||
void SetMonoMode(bool8 mono);
|
void SetOutputMode(bool8 surround);
|
||||||
void SetMP3BoostVolume(uint8 volume);
|
void SetMP3BoostVolume(uint8 volume);
|
||||||
void SetEffectsMasterVolume(uint8 volume);
|
void SetEffectsMasterVolume(uint8 volume);
|
||||||
void SetMusicMasterVolume(uint8 volume);
|
void SetMusicMasterVolume(uint8 volume);
|
||||||
@ -87,8 +87,10 @@ public:
|
|||||||
uint8 GetMissionAudioLoadingStatus(uint8 slot);
|
uint8 GetMissionAudioLoadingStatus(uint8 slot);
|
||||||
void SetMissionAudioLocation(uint8 slot, float x, float y, float z);
|
void SetMissionAudioLocation(uint8 slot, float x, float y, float z);
|
||||||
void PlayLoadedMissionAudio(uint8 slot);
|
void PlayLoadedMissionAudio(uint8 slot);
|
||||||
|
bool8 IsMissionAudioSamplePlaying(uint8 slot);
|
||||||
bool8 IsMissionAudioSampleFinished(uint8 slot);
|
bool8 IsMissionAudioSampleFinished(uint8 slot);
|
||||||
void ClearMissionAudio(uint8 slot);
|
void ClearMissionAudio(uint8 slot);
|
||||||
|
const char *GetMissionAudioLoadedLabel(uint8 slot);
|
||||||
|
|
||||||
uint8 GetRadioInCar(void);
|
uint8 GetRadioInCar(void);
|
||||||
void SetRadioInCar(uint32 radio);
|
void SetRadioInCar(uint32 radio);
|
||||||
|
Loading…
Reference in New Issue
Block a user