diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 15:04:25 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 15:04:25 +0200 |
| commit | 4141caa4d6e078fe1abbf87d8ab011c7c0705ffa (patch) | |
| tree | 03b52846a966f00edf3a818da81eb0fb67c71372 /src/audio/AudioManager.h | |
| parent | Merge remote-tracking branch 'aap/lcs' into lcs (diff) | |
| parent | Fix sampman_null (diff) | |
| download | re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar.gz re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar.bz2 re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar.lz re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar.xz re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.tar.zst re3-4141caa4d6e078fe1abbf87d8ab011c7c0705ffa.zip | |
Diffstat (limited to 'src/audio/AudioManager.h')
| -rw-r--r-- | src/audio/AudioManager.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index d58cc3fc..59a8abe8 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -22,6 +22,8 @@ public: #ifndef GTA_PS2 int32 m_nLoopStart; int32 m_nLoopEnd; +#endif +#ifdef EXTERNAL_3D_SOUND uint8 m_nEmittingVolume; #endif float m_fSpeedMultiplier; @@ -202,7 +204,7 @@ public: uint8 m_bReverb; // unused bool8 m_bFifthFrameFlag; uint8 m_nActiveSamples; - uint8 field_4; // unused + uint8 m_bDoubleVolume; // unused bool8 m_bDynamicAcousticModelingStatus; int8 field_6; float m_fSpeedOfSound; @@ -310,7 +312,7 @@ public: void GenerateIntegerRandomNumberTable(); void LoadBankIfNecessary(uint8 bank); -#ifdef GTA_PC +#ifdef EXTERNAL_3D_SOUND // actually must have been && AUDIO_MSS as well void AdjustSamplesVolume(); // inlined uint8 ComputeEmittingVolume(uint8 emittingVolume, float intensity, float dist); // inlined #endif @@ -587,6 +589,11 @@ public: #define RESET_LOOP_OFFSETS #define SET_LOOP_OFFSETS(sample) #endif +#ifdef EXTERNAL_3D_SOUND +#define SET_EMITTING_VOLUME(vol) m_sQueueSample.m_nEmittingVolume = vol +#else +#define SET_EMITTING_VOLUME(vol) +#endif //#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS) //static_assert(sizeof(cAudioManager) == 0x5558, "cAudioManager: error"); |