diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-07-29 09:16:51 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-12 10:39:34 +0200 |
| commit | 6c2d179aadd9e54afc010c7f8b79d663017d168c (patch) | |
| tree | 60190b4286698f4ff609d214fe9e423202891da2 /src/audio/sampman_miles.cpp | |
| parent | Fix unset emitting volume for sawmill (diff) | |
| download | re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar.gz re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar.bz2 re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar.lz re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar.xz re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.tar.zst re3-6c2d179aadd9e54afc010c7f8b79d663017d168c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/audio/sampman_miles.cpp | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 7c40d15d..d0c7992c 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -92,7 +92,7 @@ S32 curprovider=-1; S32 usingEAX=0; S32 usingEAX3=0; HPROVIDER opened_provider=0; -H3DSAMPLE opened_samples[MAXCHANNELS] = {0}; +H3DSAMPLE opened_samples[MAXCHANNELS ? MAXCHANNELS : 1] = {0}; HSAMPLE opened_2dsamples[MAX2DCHANNELS] = {0}; HDIGDRIVER DIG; S32 speaker_type=0; @@ -1709,7 +1709,11 @@ cSampleManager::SetChannelReverbFlag(uint32 nChannel, bool8 nReverbFlag) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1738,7 +1742,11 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1838,7 +1846,11 @@ cSampleManager::SetChannelVolume(uint32 nChannel, uint32 nVolume) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { nChannelVolume[nChannel] = vol; @@ -1866,7 +1878,11 @@ cSampleManager::SetChannelPan(uint32 nChannel, uint32 nPan) { switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { #ifndef FIX_BUGS if ( opened_samples[nChannel - MAXCHANNELS] ) // BUG @@ -1887,7 +1903,11 @@ cSampleManager::SetChannelFrequency(uint32 nChannel, uint32 nFreq) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1913,7 +1933,11 @@ cSampleManager::SetChannelLoopPoints(uint32 nChannel, uint32 nLoopStart, int32 n switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1939,7 +1963,11 @@ cSampleManager::SetChannelLoopCount(uint32 nChannel, uint32 nLoopCount) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1965,7 +1993,11 @@ cSampleManager::GetChannelUsedFlag(uint32 nChannel) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -1996,7 +2028,11 @@ cSampleManager::StartChannel(uint32 nChannel) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; @@ -2022,7 +2058,11 @@ cSampleManager::StopChannel(uint32 nChannel) switch ( nChannel ) { +#ifdef EXTERNAL_3D_SOUND case CHANNEL_POLICE_RADIO: +#else + default: +#endif { b2d = TRUE; break; |