diff options
| author | withmorten <morten.with@gmail.com> | 2021-07-07 01:59:16 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-07-07 01:59:16 +0200 |
| commit | e6544a69834f6bf8c8b412d02d19c3b5c29f9178 (patch) | |
| tree | 4afbd9e32ea258dd7e7eda0ef3966d0235db0484 | |
| parent | fix: printHash.sh; replace echo -n, check if $1 is set. (diff) | |
| download | re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar.gz re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar.bz2 re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar.lz re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar.xz re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.tar.zst re3-e6544a69834f6bf8c8b412d02d19c3b5c29f9178.zip | |
| -rw-r--r-- | src/audio/sampman_null.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp index a5ed2889..af4c54ad 100644 --- a/src/audio/sampman_null.cpp +++ b/src/audio/sampman_null.cpp @@ -114,7 +114,7 @@ cSampleManager::SetMusicMasterVolume(uint8 nVolume) } void -cSampleManager::SetMusicMasterVolume(uint8 nVolume) +cSampleManager::SetMP3BoostVolume(uint8 nVolume) { } @@ -231,35 +231,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 ); } |