From cce3aac4c3ea654f943b8b4b9cb81a733ad2a87b Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Sun, 27 Oct 2019 19:04:13 +0200 Subject: Audio fixes --- src/audio/AudioManager.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index ef7900e2..2a4fcb2c 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -449,7 +449,7 @@ public: float speedMultiplier) const; /// ok int32 ComputePan(float, CVector *); /// ok uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const; /// ok - int32 CreateEntity(int32 type, CPhysical *entity); /// ok + int32 CreateEntity(int32 type, void* entity); /// ok void DestroyAllGameCreatedEntities(); /// ok void DestroyEntity(int32 id); /// ok @@ -653,7 +653,7 @@ public: void ReportCollision(CEntity *entity1, CEntity *entity2, uint8 surface1, uint8 surface2, float collisionPower, float intensity2); /// ok void ReportCrime(int32 crime, const CVector *pos); /// ok - void ResetAudioLogicTimers(int32 timer); /// ok + void ResetAudioLogicTimers(uint32 timer); /// ok void ResetPoliceRadio(); /// ok void ResetTimers(uint32 time); /// ok @@ -666,7 +666,7 @@ public: void SetDynamicAcousticModelingStatus(bool status); void SetEffectsFadeVolume(uint8 volume) const; void SetEffectsMasterVolume(uint8 volume) const; - void SetEntityStatus(int32 id, bool status); + void SetEntityStatus(int32 id, uint8 status); uint32 SetLoopingCollisionRequestedSfxFreqAndGetVol(cAudioCollision *audioCollision); /// ok void SetMissionAudioLocation(float x, float y, float z); void SetMissionScriptPoliceAudio(int32 sfx) const; -- cgit v1.2.3 From a2e59564c858d3befff922692cd38d27ef25c11b Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 27 Oct 2019 18:39:17 +0100 Subject: Implement PreloadMissionAudio + small fixes --- src/audio/AudioManager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 2a4fcb2c..30f411a7 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -576,8 +576,8 @@ public: void PlayerJustLeftCar() const; /// ok void PostInitialiseGameSpecificSetup(); /// ok void PostTerminateGameSpecificShutdown(); /// ok - void PreInitialiseGameSpecificSetup() const; // ok - void PreloadMissionAudio(char *); // todo + void PreInitialiseGameSpecificSetup() const; /// ok + void PreloadMissionAudio(const char *name); /// ok void PreTerminateGameSpecificShutdown(); /// ok /// processX - main logic of adding new sounds void ProcessActiveQueues(); // todo -- cgit v1.2.3 From 5e771f17372919724e00dc12895dc9a8f3cbf79a Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Tue, 5 Nov 2019 00:31:50 +0100 Subject: RE cAudioManager::UpdateReflections --- src/audio/AudioManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 30f411a7..19809286 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -689,7 +689,7 @@ public: void TranslateEntity(CVector *v1, CVector *v2) const; void UpdateGasPedalAudio(CAutomobile *automobile); - void UpdateReflections(); // todo + void UpdateReflections(); bool UsesReverseWarning(int32 model) const; bool UsesSiren(int32 model) const; bool UsesSirenSwitching(int32 model) const; -- cgit v1.2.3