diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-15 12:14:16 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-15 12:14:16 +0200 |
| commit | 5ddd0649e30178964c4acaca3938c446655f0cb9 (patch) | |
| tree | 30f00e36718bf769b281110830c4e05aad794ccf /src/audio/AudioManager.h | |
| parent | Fix CW build (diff) | |
| download | re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar.gz re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar.bz2 re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar.lz re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar.xz re3-5ddd0649e30178964c4acaca3938c446655f0cb9.tar.zst re3-5ddd0649e30178964c4acaca3938c446655f0cb9.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/AudioManager.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 74092c51..79eb08d6 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -8,7 +8,11 @@ class tSound { public: int32 m_nEntityIndex; +#if GTA_VERSION >= GTA3_PC_10 int32 m_nCounter; +#else + uint8 m_nCounter; +#endif int32 m_nSampleIndex; uint8 m_nBankIndex; bool8 m_bIs2D; @@ -25,16 +29,25 @@ public: uint8 m_nEmittingVolume; #endif float m_fSpeedMultiplier; - float m_fSoundIntensity; +#if GTA_VERSION >= GTA3_PC_10 + float m_SoundIntensity; +#else + uint32 m_SoundIntensity; +#endif bool8 m_bReleasingSoundFlag; CVector m_vecPos; bool8 m_bReverbFlag; +#if GTA_VERSION >= GTA3_PC_10 uint8 m_nLoopsRemaining; bool8 m_bRequireReflection; // Used for oneshots +#endif uint8 m_nOffset; int32 m_nReleasingVolumeDivider; bool8 m_bIsProcessed; bool8 m_bLoopEnded; +#if GTA_VERSION < GTA3_PC_10 + int32 unk; // only on PS2, seems unused +#endif int32 m_nCalculatedVolume; int8 m_nVolumeChange; }; @@ -276,7 +289,7 @@ public: void InterrogateAudioEntities(); // inlined on PS2 void AddSampleToRequestedQueue(); void AddDetailsToRequestedOrderList(uint8 sample); // inlined on PS2 -#ifdef GTA_PC +#if GTA_VERSION >= GTA3_PC_10 void AddReflectionsToRequestedQueue(); void UpdateReflections(); #endif @@ -312,7 +325,7 @@ public: void ProcessModelCarEngine(cVehicleParams ¶ms); bool8 ProcessVehicleRoadNoise(cVehicleParams ¶ms); bool8 ProcessWetRoadNoise(cVehicleParams ¶ms); - void ProcessVehicleEngine(cVehicleParams ¶ms); + bool8 ProcessVehicleEngine(cVehicleParams ¶ms); void UpdateGasPedalAudio(CAutomobile *automobile); // inlined on PS2 void PlayerJustGotInCar(); void PlayerJustLeftCar(); |