summaryrefslogtreecommitdiffstats
path: root/src/audio/AudioManager.h
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-05-23 15:14:30 +0200
committerSergeanur <s.anureev@yandex.ua>2021-06-24 20:32:43 +0200
commit7a2dbd9112d9537453bb51a503858b769af32204 (patch)
treea22d211dbc943a08b64449e57961230736de671f /src/audio/AudioManager.h
parentThis means sound should be panned right, not volume (diff)
downloadre3-7a2dbd9112d9537453bb51a503858b769af32204.tar
re3-7a2dbd9112d9537453bb51a503858b769af32204.tar.gz
re3-7a2dbd9112d9537453bb51a503858b769af32204.tar.bz2
re3-7a2dbd9112d9537453bb51a503858b769af32204.tar.lz
re3-7a2dbd9112d9537453bb51a503858b769af32204.tar.xz
re3-7a2dbd9112d9537453bb51a503858b769af32204.tar.zst
re3-7a2dbd9112d9537453bb51a503858b769af32204.zip
Diffstat (limited to 'src/audio/AudioManager.h')
-rw-r--r--src/audio/AudioManager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index 4a888788..a3ae4cfb 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -195,10 +195,10 @@ public:
int32 m_nTimer;
tSound m_sQueueSample;
uint8 m_nActiveSampleQueue;
- tSound m_asSamples[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
- uint8 m_abSampleQueueIndexTable[NUM_SOUNDS_SAMPLES_BANKS][NUM_SOUNDS_SAMPLES_SLOTS];
+ 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];
- tSound m_asActiveSamples[NUM_SOUNDS_SAMPLES_SLOTS];
+ tSound m_asActiveSamples[NUM_CHANNELS_GENERIC];
tAudioEntity m_asAudioEntities[NUM_AUDIOENTITIES];
int32 m_anAudioEntityIndices[NUM_AUDIOENTITIES];
int32 m_nAudioEntitiesTotal;
@@ -498,7 +498,7 @@ public:
#endif
};
-#ifdef AUDIO_MSS
+#if defined(AUDIO_MSS) && !defined(PS2_AUDIO_CHANNELS)
static_assert(sizeof(cAudioManager) == 19220, "cAudioManager: error");
#endif