diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-08 23:05:26 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-07-08 23:05:26 +0200 |
| commit | d781db6c0f669eaccecee246260290aa20f70020 (patch) | |
| tree | fc963b1e8f3c127a49095a127850bfc1cd09111e /src/audio | |
| parent | Mission audio cleanup + sound pause (diff) | |
| parent | Use CPad functions to check key states in script loader (diff) | |
| download | re3-d781db6c0f669eaccecee246260290aa20f70020.tar re3-d781db6c0f669eaccecee246260290aa20f70020.tar.gz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.bz2 re3-d781db6c0f669eaccecee246260290aa20f70020.tar.lz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.xz re3-d781db6c0f669eaccecee246260290aa20f70020.tar.zst re3-d781db6c0f669eaccecee246260290aa20f70020.zip | |
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/sampman_miles.cpp | 1 | ||||
| -rw-r--r-- | src/audio/sampman_null.cpp | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 88eceecf..73d4406d 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1,3 +1,4 @@ +#define WITHWINDOWS #include "common.h" #ifdef AUDIO_MSS 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 ); } |