mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 18:39:00 +00:00
Code Issues Projects Releases Wiki Activity

Reverse unused audio functions from mobile

Browse source 
# Conflicts:
#	src/audio/AudioManager.h
This commit is contained in:
Sergeanur 2021-07-29 00:40:32 +03:00
parent 2aa37813d2
commit cce97588fe
4 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/audio/AudioManager.cpp
View file

@ -160,6 +160,14 @@ cAudioManager::DestroyEntity(int32 id)
} }
} }
bool8
cAudioManager::GetEntityStatus(int32 id)
{
if (m_bIsInitialised && id >= 0 && id < NUM_AUDIOENTITIES && m_asAudioEntities[id].m_bIsUsed)
return m_asAudioEntities[id].m_bStatus;
return FALSE;
}
void void
cAudioManager::SetEntityStatus(int32 id, bool8 status) cAudioManager::SetEntityStatus(int32 id, bool8 status)
{ {
@ -167,6 +175,14 @@ cAudioManager::SetEntityStatus(int32 id, bool8 status)
m_asAudioEntities[id].m_bStatus = status; m_asAudioEntities[id].m_bStatus = status;
} }
void *
cAudioManager::GetEntityPointer(int32 id)
{
if (m_bIsInitialised && id >= 0 && id < NUM_AUDIOENTITIES && m_asAudioEntities[id].m_bIsUsed)
return m_asAudioEntities[id].m_pEntity;
return NULL;
}
void void
cAudioManager::PlayOneShot(int32 index, uint16 sound, float vol) cAudioManager::PlayOneShot(int32 index, uint16 sound, float vol)
{ {

4
src/audio/AudioManager.h
View file

@ -51,7 +51,7 @@ public:
eAudioType m_nType; eAudioType m_nType;
void *m_pEntity; void *m_pEntity;
bool8 m_bIsUsed; bool8 m_bIsUsed;
uint8 m_bStatus; bool8 m_bStatus;
int16 m_awAudioEvent[NUM_AUDIOENTITY_EVENTS]; int16 m_awAudioEvent[NUM_AUDIOENTITY_EVENTS];
float m_afVolume[NUM_AUDIOENTITY_EVENTS]; float m_afVolume[NUM_AUDIOENTITY_EVENTS];
uint8 m_AudioEvents; uint8 m_AudioEvents;
@ -255,7 +255,9 @@ public:
void Service(); void Service();
int32 CreateEntity(eAudioType type, void *entity); int32 CreateEntity(eAudioType type, void *entity);
void DestroyEntity(int32 id); // inlined in vc void DestroyEntity(int32 id); // inlined in vc
bool8 GetEntityStatus(int32 id);
void SetEntityStatus(int32 id, bool8 status); void SetEntityStatus(int32 id, bool8 status);
void *GetEntityPointer(int32 id);
void PlayOneShot(int32 index, uint16 sound, float vol); void PlayOneShot(int32 index, uint16 sound, float vol);
void SetEffectsMasterVolume(uint8 volume); void SetEffectsMasterVolume(uint8 volume);
void SetMusicMasterVolume(uint8 volume); void SetMusicMasterVolume(uint8 volume);

12
src/audio/DMAudio.cpp
View file

@ -38,6 +38,12 @@ cDMAudio::DestroyEntity(int32 audioEntity)
AudioManager.DestroyEntity(audioEntity); AudioManager.DestroyEntity(audioEntity);
} }
bool8
cDMAudio::GetEntityStatus(int32 audioEntity)
{
return AudioManager.GetEntityStatus(audioEntity);
}
void void
cDMAudio::SetEntityStatus(int32 audioEntity, bool8 status) cDMAudio::SetEntityStatus(int32 audioEntity, bool8 status)
{ {
@ -184,6 +190,12 @@ cDMAudio::IsAudioInitialised(void)
return AudioManager.IsAudioInitialised(); return AudioManager.IsAudioInitialised();
} }
void
cDMAudio::ResetPoliceRadio()
{
AudioManager.ResetPoliceRadio();
}
void void
cDMAudio::ReportCrime(eCrimeType crime, const CVector &pos) cDMAudio::ReportCrime(eCrimeType crime, const CVector &pos)
{ {

2
src/audio/DMAudio.h
View file

@ -25,6 +25,7 @@ public:
int32 CreateEntity(eAudioType type, void *UID); int32 CreateEntity(eAudioType type, void *UID);
void DestroyEntity(int32 audioEntity); void DestroyEntity(int32 audioEntity);
bool8 GetEntityStatus(int32 audioEntity);
void SetEntityStatus(int32 audioEntity, bool8 status); void SetEntityStatus(int32 audioEntity, bool8 status);
void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume); void PlayOneShot(int32 audioEntity, uint16 oneShot, float volume);
void DestroyAllGameCreatedEntities(void); void DestroyAllGameCreatedEntities(void);
@ -58,6 +59,7 @@ public:
char GetCDAudioDriveLetter(void); char GetCDAudioDriveLetter(void);
bool8 IsAudioInitialised(void); bool8 IsAudioInitialised(void);
void ResetPoliceRadio();
void ReportCrime(eCrimeType crime, CVector const &pos); void ReportCrime(eCrimeType crime, CVector const &pos);
int32 CreateLoopingScriptObject(cAudioScriptObject *scriptObject); int32 CreateLoopingScriptObject(cAudioScriptObject *scriptObject);