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

More audio windows

Browse Source
This commit is contained in:
Filip Gawin 2019-09-26 20:47:04 +02:00
parent d2941b0368
commit 47d2cf6c0a
3 changed files with 987 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1021
src/audio/AudioManager.cpp
View File

File diff suppressed because it is too large Load Diff

15
src/audio/AudioManager.h
View File

@ -239,7 +239,7 @@ struct Crime {
int32 type; int32 type;
CVector position; CVector position;
uint16 timer; uint16 timer;
uint16 b; uint16 gap;
}; };
static_assert(sizeof(Crime) == 20, "Crime: error "); static_assert(sizeof(Crime) == 20, "Crime: error ");
@ -282,12 +282,11 @@ public:
int32 m_nFireAudioEntity; int32 m_nFireAudioEntity;
int32 m_nWaterCannonEntity; int32 m_nWaterCannonEntity;
int32 m_nPoliceChannelEntity; int32 m_nPoliceChannelEntity;
uint8 stuff[239]; int32 crimesSamples[60];
uint8 unk1;
uint8 policeChannelTimer; uint8 policeChannelTimer;
uint8 unk3; uint8 policeChannelTimerSeconds;
uint8 policeChannelCounterSeconds; uint8 policeChannelCounterSeconds;
uint8 unk5; uint8 gap30;
Crime crimes[10]; Crime crimes[10];
int32 m_nFrontEndEntity; int32 m_nFrontEndEntity;
int32 m_nCollisionEntity; int32 m_nCollisionEntity;
@ -447,7 +446,7 @@ public:
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); // to do (need testing)
uint32 PlaySuspectLastSeen(float x, float y, float z); // todo void PlaySuspectLastSeen(float x, float y, float z); // todo cleanup and hook
void PlayerJustGotInCar() const; /// ok void PlayerJustGotInCar() const; /// ok
void PlayerJustLeftCar() const; /// ok void PlayerJustLeftCar() const; /// ok
void PostInitialiseGameSpecificSetup(); /// ok void PostInitialiseGameSpecificSetup(); /// ok
@ -552,14 +551,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 bool SetupCrimeReport(); // todo cleanup and hook
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 void SetupSuspectLastSeenReport(); // todo cleanup and hook
void Terminate(); void Terminate();
void TranslateEntity(CVector *v1, CVector *v2) const; void TranslateEntity(CVector *v1, CVector *v2) const;

2
src/render/WaterCannon.cpp
View File

@ -2,7 +2,7 @@
#include "patcher.h" #include "patcher.h"
#include "WaterCannon.h" #include "WaterCannon.h"
extern CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8; CWaterCannon* aCannons = (CWaterCannon*)0x8F2CA8;
WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); } WRAPPER void CWaterCannons::Update(void) { EAXJMP(0x522510); }
WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); } WRAPPER void CWaterCannon::UpdateOne(uint32 id, CVector *pos, CVector *dir) { EAXJMP(0x522470); }