summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-07-07 01:54:16 +0200
committerwithmorten <morten.with@gmail.com>2021-07-07 01:54:16 +0200
commitdadc56ccf9c334b2c5408886a79ad4d8f8c52b1b (patch)
treebdcd476ce9238b56c7d0727e88a5d02a55e47cc3
parentMerge pull request #1188 from mssx86/echo_to_printf (diff)
downloadre3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar.gz
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar.bz2
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar.lz
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar.xz
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.tar.zst
re3-dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b.zip
Diffstat (limited to '')
-rw-r--r--src/audio/sampman_null.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index 95603c72..df912a9a 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -226,35 +226,35 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
void
cSampleManager::SetChannelEmittingVolume(uint32 nChannel, uint32 nVolume)
{
- ASSERT( nChannel != CHANNEL2D );
+ ASSERT( nChannel < MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}
void
cSampleManager::SetChannel3DPosition(uint32 nChannel, float fX, float fY, float fZ)
{
- ASSERT( nChannel != CHANNEL2D );
+ ASSERT( nChannel < MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}
void
cSampleManager::SetChannel3DDistances(uint32 nChannel, float fMax, float fMin)
{
- ASSERT( nChannel != CHANNEL2D );
+ ASSERT( nChannel < MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}
void
cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume)
{
- ASSERT( nChannel == CHANNEL2D );
+ ASSERT( nChannel >= MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}
void
cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan)
{
- ASSERT(nChannel == CHANNEL2D);
+ ASSERT( nChannel >= MAXCHANNELS );
ASSERT( nChannel < MAXCHANNELS+MAX2DCHANNELS );
}