Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Cleanup police radio

Browse Source
This commit is contained in:
Filip Gawin 2019-09-27 23:19:43 +02:00
parent 47d2cf6c0a
commit 8c52cdbedd
2 changed files with 726 additions and 971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1522
src/audio/AudioManager.cpp
View File

File diff suppressed because it is too large Load Diff

17
src/audio/AudioManager.h
View File

@ -4,9 +4,8 @@
#include "DMAudio.h" #include "DMAudio.h"
#include "common.h" #include "common.h"
class tActiveSample struct tActiveSample
{ {
public:
int32 m_nEntityIndex; int32 m_nEntityIndex;
int32 m_counter; int32 m_counter;
int32 m_nSampleIndex; int32 m_nSampleIndex;
@ -76,9 +75,8 @@ enum eAudioType : int32 {
class CPhysical; class CPhysical;
class CAutomobile; class CAutomobile;
class tAudioEntity struct tAudioEntity
{ {
public:
eAudioType m_nType; eAudioType m_nType;
void *m_pEntity; void *m_pEntity;
bool m_bIsUsed; bool m_bIsUsed;
@ -94,9 +92,8 @@ public:
static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error"); static_assert(sizeof(tAudioEntity) == 40, "tAudioEntity: error");
class tPedComment struct tPedComment
{ {
public:
int32 m_nSampleIndex; int32 m_nSampleIndex;
int32 m_entityIndex; int32 m_entityIndex;
CVector m_vecPos; CVector m_vecPos;
@ -445,8 +442,8 @@ public:
bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok bool MissionScriptAudioUsesPoliceChannel(int32 soundMission) const; /// ok
void PlayLoadedMissionAudio(); /// ok void PlayLoadedMissionAudio(); /// ok
void PlayOneShot(int32 index, int16 sound, float vol); // to do (need testing) void PlayOneShot(int32 index, int16 sound, float vol); /// ok
void PlaySuspectLastSeen(float x, float y, float z); // todo cleanup and hook void PlaySuspectLastSeen(float x, float y, float z); /// ok
void PlayerJustGotInCar() const; /// ok void PlayerJustGotInCar() const; /// ok
void PlayerJustLeftCar() const; /// ok void PlayerJustLeftCar() const; /// ok
void PostInitialiseGameSpecificSetup(); /// ok void PostInitialiseGameSpecificSetup(); /// ok
@ -551,14 +548,14 @@ public:
void SetSpeakerConfig(int32 conf) const; void SetSpeakerConfig(int32 conf) const;
void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter); /// ok void SetUpLoopingCollisionSound(cAudioCollision *col, uint8 counter); /// ok
void SetUpOneShotCollisionSound(cAudioCollision *col); /// ok void SetUpOneShotCollisionSound(cAudioCollision *col); /// ok
bool SetupCrimeReport(); // todo cleanup and hook bool SetupCrimeReport(); /// ok
bool SetupJumboEngineSound(uint8 a2, int32 a3); // todo bool SetupJumboEngineSound(uint8 a2, int32 a3); // todo
bool SetupJumboFlySound(uint8 emittingVol); /// ok bool SetupJumboFlySound(uint8 emittingVol); /// ok
bool SetupJumboRumbleSound(uint8 emittingVol); /// ok bool SetupJumboRumbleSound(uint8 emittingVol); /// ok
bool SetupJumboTaxiSound(uint8 vol); /// ok bool SetupJumboTaxiSound(uint8 vol); /// ok
bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok bool SetupJumboWhineSound(uint8 emittingVol, int32 freq); /// ok
void SetupPedComments(cPedParams *params, uint32 sound); /// ok void SetupPedComments(cPedParams *params, uint32 sound); /// ok
void SetupSuspectLastSeenReport(); // todo cleanup and hook void SetupSuspectLastSeenReport(); /// ok
void Terminate(); void Terminate();
void TranslateEntity(CVector *v1, CVector *v2) const; void TranslateEntity(CVector *v1, CVector *v2) const;