diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 07:49:58 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-25 07:49:58 +0200 |
| commit | c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9 (patch) | |
| tree | 4e070d777e5fa2d947ba94ba6b2cba8f1afc92d3 /src/audio/AudioManager.h | |
| parent | Audio: fix PS2 ifdefs (diff) | |
| download | re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.gz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.bz2 re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.lz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.xz re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.tar.zst re3-c8492ab5e00d458f50d053e6b4e7c8c7af4d32a9.zip | |
Diffstat (limited to 'src/audio/AudioManager.h')
| -rw-r--r-- | src/audio/AudioManager.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h index 8708fecd..b82d1130 100644 --- a/src/audio/AudioManager.h +++ b/src/audio/AudioManager.h @@ -232,16 +232,16 @@ public: uint8 m_nChannelOffset; float m_fSpeedOfSound; bool8 m_bTimerJustReset; - int32 m_nTimer; + uint32 m_nTimer; tSound m_sQueueSample; - uint8 m_nActiveSampleQueue; - tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC]; - uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_CHANNELS_GENERIC]; - uint8 m_SampleRequestQueuesStatus[NUM_SOUNDS_SAMPLES_BANKS]; + uint8 m_nActiveQueue; + tSound m_aRequestedQueue[NUM_SOUND_QUEUES][NUM_CHANNELS_GENERIC]; + uint8 m_aRequestedOrderList[NUM_SOUND_QUEUES][NUM_CHANNELS_GENERIC]; + uint8 m_nRequestedCount[NUM_SOUND_QUEUES]; tSound m_asActiveSamples[NUM_CHANNELS_GENERIC]; tAudioEntity m_asAudioEntities[NUM_AUDIOENTITIES]; - int32 m_anAudioEntityIndices[NUM_AUDIOENTITIES]; - int32 m_nAudioEntitiesTotal; + uint32 m_aAudioEntityOrderList[NUM_AUDIOENTITIES]; + uint32 m_nAudioEntitiesCount; #ifdef AUDIO_REFLECTIONS CVector m_avecReflectionsPos[MAX_REFLECTIONS]; float m_afReflectionsDistances[MAX_REFLECTIONS]; @@ -280,15 +280,15 @@ public: uint8 m_nMissionAudioLoadingStatus[MISSION_AUDIO_SLOTS]; uint8 m_nMissionAudioPlayStatus[MISSION_AUDIO_SLOTS]; bool8 m_bIsMissionAudioPlaying[MISSION_AUDIO_SLOTS]; - int32 m_nMissionAudioFramesToPlay[MISSION_AUDIO_SLOTS]; + int32 m_nMissionAudioFramesToPlay[MISSION_AUDIO_SLOTS]; // possibly unsigned bool8 m_bIsMissionAudioAllowedToPlay[MISSION_AUDIO_SLOTS]; bool8 m_bIsMissionAudioPhoneCall[MISSION_AUDIO_SLOTS]; uint8 m_nGlobalSfxVolumeMultiplier; // used to lower sfx volume during phone calls int32 m_anRandomTable[5]; uint8 m_nTimeSpent; - bool8 m_nUserPause; - bool8 m_nPreviousUserPause; + bool8 m_bIsPaused; + bool8 m_bWasPaused; uint32 m_FrameCounter; cAudioManager(); |