From c6256aab4fe6145a81030b922f93ff60f91c88eb Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:06:38 +0200 Subject: GenerateIntegerRandomNumberTable --- src/audio/AudioManager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index aa7d1f72..b37464bd 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,8 @@ public: char field_19195; int m_nTimeOfRecentCrime; + void GenerateIntegerRandomNumberTable(); + void PlayerJustLeftCar(void); void Service(); void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, -- cgit v1.2.3 From 7488f094e2d380fbf2cb700b9848b85e6117eafc Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:27:48 +0200 Subject: IsAudioInitialised --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index b37464bd..23f762b8 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,7 @@ public: char field_19195; int m_nTimeOfRecentCrime; + bool IsAudioInitialised() const; void GenerateIntegerRandomNumberTable(); void PlayerJustLeftCar(void); -- cgit v1.2.3 From 404d9bedd2d28310716a7d35f67408502cf78126 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:31:14 +0200 Subject: SetDynamicAcousticModelingStatus --- src/audio/AudioManager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 23f762b8..2d2fced8 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -175,7 +175,7 @@ public: char field_2; char m_bActiveSamples; char field_4; - char m_bDynamicAcousticModelingStatus; + bool m_bDynamicAcousticModelingStatus; char field_6; char field_7; float field_8; @@ -217,6 +217,7 @@ public: int m_nTimeOfRecentCrime; bool IsAudioInitialised() const; + void SetDynamicAcousticModelingStatus(bool status); void GenerateIntegerRandomNumberTable(); void PlayerJustLeftCar(void); -- cgit v1.2.3 From bd23f2c425896e379a85424f3f506e507cf90df9 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:39:54 +0200 Subject: PostTerminateGameSpecificShutdown --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 2d2fced8..faae3305 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,7 @@ public: char field_19195; int m_nTimeOfRecentCrime; + void PostTerminateGameSpecificShutdown(); bool IsAudioInitialised() const; void SetDynamicAcousticModelingStatus(bool status); void GenerateIntegerRandomNumberTable(); -- cgit v1.2.3 From 1abd6941074b9f0ca74c8f0f5ef11b04291b0902 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:44:43 +0200 Subject: DestroyEntity --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index faae3305..f270ada6 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,7 @@ public: char field_19195; int m_nTimeOfRecentCrime; + void DestroyEntity(int32 id); void PostTerminateGameSpecificShutdown(); bool IsAudioInitialised() const; void SetDynamicAcousticModelingStatus(bool status); -- cgit v1.2.3 From 9df4bc202970f5b9025adc088132f9605e7a612c Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:48:33 +0200 Subject: PreTerminateGameSpecificShutdown --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index f270ada6..8d01e1eb 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,7 @@ public: char field_19195; int m_nTimeOfRecentCrime; + void PreTerminateGameSpecificShutdown(); void DestroyEntity(int32 id); void PostTerminateGameSpecificShutdown(); bool IsAudioInitialised() const; -- cgit v1.2.3 From 198a92555cb7dbc71b5ea036b744b749a667c703 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 22:55:58 +0200 Subject: SetEntityStatus --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 8d01e1eb..8e5ecc0f 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,7 @@ public: char field_19195; int m_nTimeOfRecentCrime; + void SetEntityStatus(int32 id, bool status); void PreTerminateGameSpecificShutdown(); void DestroyEntity(int32 id); void PostTerminateGameSpecificShutdown(); -- cgit v1.2.3 From 8cd2a19c4ef6cdc38fe65d0e01904e5d5547b788 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 23:20:10 +0200 Subject: CreateEntity --- src/audio/AudioManager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 8e5ecc0f..24193448 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -76,7 +76,7 @@ class tAudioEntity public: eAudioType m_nType; void *m_pEntity; - char m_bIsUsed; + bool m_bIsUsed; char m_bStatus; int16 m_awAudioEvent[4]; char gap_18[2]; @@ -218,6 +218,7 @@ public: void SetEntityStatus(int32 id, bool status); void PreTerminateGameSpecificShutdown(); + int32 CreateEntity(int32 type, void *memory); void DestroyEntity(int32 id); void PostTerminateGameSpecificShutdown(); bool IsAudioInitialised() const; -- cgit v1.2.3 From e589589538b5258b069caeed3fa9a8b27d0e95c2 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 23:46:21 +0200 Subject: PlayerJustGotInCar --- src/audio/AudioManager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 24193448..df48475f 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -225,7 +225,8 @@ public: void SetDynamicAcousticModelingStatus(bool status); void GenerateIntegerRandomNumberTable(); - void PlayerJustLeftCar(void); + void PlayerJustGotInCar(); + void PlayerJustLeftCar(); void Service(); void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset); -- cgit v1.2.3 From 9357e5cc83f0a0df1fa259d3194a0b13cbfb374f Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 30 Jun 2019 23:58:24 +0200 Subject: ReleaseDigitalHandle --- src/audio/AudioManager.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index df48475f..9cbb82b4 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,17 +216,23 @@ public: char field_19195; int m_nTimeOfRecentCrime; - void SetEntityStatus(int32 id, bool status); - void PreTerminateGameSpecificShutdown(); + void ReleaseDigitalHandle(); + void SetDynamicAcousticModelingStatus(bool status); + + bool IsAudioInitialised() const; + int32 CreateEntity(int32 type, void *memory); void DestroyEntity(int32 id); + void SetEntityStatus(int32 id, bool status); + + void PreTerminateGameSpecificShutdown(); void PostTerminateGameSpecificShutdown(); - bool IsAudioInitialised() const; - void SetDynamicAcousticModelingStatus(bool status); + void GenerateIntegerRandomNumberTable(); void PlayerJustGotInCar(); void PlayerJustLeftCar(); + void Service(); void GetPhrase(uint32 *phrase, uint32 *prevPhrase, uint32 sample, uint32 maxOffset); -- cgit v1.2.3 From 0ec77e8329210301a87fe9b9953b820c09c6505b Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Mon, 1 Jul 2019 00:07:58 +0200 Subject: RequireDigitalHandle --- src/audio/AudioManager.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 9cbb82b4..6b320b60 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -217,6 +217,7 @@ public: int m_nTimeOfRecentCrime; void ReleaseDigitalHandle(); + void RequireDigitalHandle(); void SetDynamicAcousticModelingStatus(bool status); bool IsAudioInitialised() const; -- cgit v1.2.3 From d6957aaa57c814a2d779874cd714c65ab9e321c3 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Mon, 1 Jul 2019 16:21:03 +0200 Subject: RandomDisplacement --- src/audio/AudioManager.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 6b320b60..95478922 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -216,6 +216,8 @@ public: char field_19195; int m_nTimeOfRecentCrime; + int32 RandomDisplacement(uint32 seed); + void ReleaseDigitalHandle(); void RequireDigitalHandle(); void SetDynamicAcousticModelingStatus(bool status); -- cgit v1.2.3 From e3fcb686cc9a69a14ca10066efa330bbb9700fd6 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Tue, 2 Jul 2019 20:35:47 +0200 Subject: More AudioManager --- src/audio/AudioManager.h | 76 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) (limited to 'src/audio/AudioManager.h') diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 95478922..24dae2ce 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -71,11 +71,13 @@ enum eAudioType : int32 { TOTAL_AUDIO_TYPES = 14, }; +class CPhysical; + class tAudioEntity { public: eAudioType m_nType; - void *m_pEntity; + CPhysical *m_pEntity; bool m_bIsUsed; char m_bStatus; int16 m_awAudioEvent[4]; @@ -159,7 +161,7 @@ public: char field_22; char field_23; int field_24; - char m_bIsPlayed; + bool m_bIsPlayed; char field_29; char field_30; char field_31; @@ -185,7 +187,7 @@ public: char field_15; int m_nTimer; tActiveSample m_sQueueSample; - char m_bActiveSampleQueue; + uint8 m_bActiveSampleQueue; char gap_109[3]; tActiveSample m_asSamples[54]; char m_abSampleQueueIndexTable[54]; @@ -216,6 +218,72 @@ public: char field_19195; int m_nTimeOfRecentCrime; + char GetMissionScriptPoliceAudioPlayingStatus(); + bool GetMissionAudioLoadingStatus(); + + uint8 GetNum3DProvidersAvailable(); + int8 AutoDetect3DProviders(); + bool IsMP3RadioChannelAvailable(); + uint8 GetCDAudioDriveLetter(); + + void SetEffectsMasterVolume(uint8 volume); + void SetMusicMasterVolume(uint8 volume); + void SetEffectsFadeVol(uint8 volume); + void SetMusicFadeVol(uint8 volume); + + void SetSpeakerConfig(int32 conf); + + void ProcessJumboFlying(); + bool SetupJumboEngineSound(uint8, int32); // todo + void PreInitialiseGameSpecificSetup(); + void SetMissionScriptPoliceAudio(int32 sfx); + + void CalculateDistance(bool *ptr, float dist); + + bool UsesSiren(int32 model); + bool UsesSirenSwitching(int32 model); + + bool MissionScriptAudioUsesPoliceChannel(int32 soundMission); + + uint8 Get3DProviderName(uint8 id); + + void ProcessJumboTaxi(); + bool SetupJumboFlySound(uint8); // todo + bool SetupJumboTaxiSound(uint8); // todo + bool SetupJumboWhineSound(uint8, int32); // todo + + void PlayLoadedMissionAudio(); + + void SetMissionAudioLocation(float x, float y, float z); + + void ResetPoliceRadio(); + + void InterrogateAudioEntities(); + + void ClearRequestedQueue(); +// void AgeCrimes(); + + bool UsesReverseWarning(int32 model); + bool HasAirBrakes(int32 model); + + int32 GetJumboTaxiFreq(); + + void ProcessPhysical(int32 id); + void ProcessVehicle(CPhysical *); // todo + void ProcessPed(CPhysical *); // todo + void ProcessPlane(void *); // todo + + void ClearMissionAudio(); +// void ProcessReverb(); + + bool IsMissionAudioSampleFinished(); + + void ProcessEntity(int32); + + void InitialisePoliceRadio(); + + // done + int32 RandomDisplacement(uint32 seed); void ReleaseDigitalHandle(); @@ -224,7 +292,7 @@ public: bool IsAudioInitialised() const; - int32 CreateEntity(int32 type, void *memory); + int32 CreateEntity(int32 type, CPhysical *memory); void DestroyEntity(int32 id); void SetEntityStatus(int32 id, bool status); -- cgit v1.2.3