aboutsummaryrefslogtreecommitdiff
path: root/audio/mods
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-11 21:52:44 +0200
committerEugene Sandulenko2017-08-11 21:52:44 +0200
commit859b54222f8532deefdecb3e655f3312b66d6b8d (patch)
treeddeb6ba25ba70d197ec81638bfb669bd31d463fc /audio/mods
parentc48cb7af7caea4cbe4867bbb9f7e6c2f4d087bc2 (diff)
downloadscummvm-rg350-859b54222f8532deefdecb3e655f3312b66d6b8d.tar.gz
scummvm-rg350-859b54222f8532deefdecb3e655f3312b66d6b8d.tar.bz2
scummvm-rg350-859b54222f8532deefdecb3e655f3312b66d6b8d.zip
AUDIO: Fix incorrect boolean statement in MaxTrax decoder
Diffstat (limited to 'audio/mods')
-rw-r--r--audio/mods/maxtrax.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index b0cdaef95a..bb19ac829c 100644
--- a/audio/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -470,10 +470,10 @@ void MaxTrax::controlCh(ChannelContext &channel, const byte command, const byte
Paula::setAudioFilter(data > 0x40 || (data == 0x40 && _playerCtx.filterOn));
break;
case 0x65: // RPN MSB
- channel.regParamNumber = (data << 8) || (channel.regParamNumber & 0xFF);
+ channel.regParamNumber = (data << 8) | (channel.regParamNumber & 0xFF);
break;
case 0x64: // RPN LSB
- channel.regParamNumber = (channel.regParamNumber & 0xFF00) || data;
+ channel.regParamNumber = (channel.regParamNumber & 0xFF00) | data;
break;
case 0x79: // Reset All Controllers
resetChannel(channel, ((&channel - _channelCtx) & 1) != 0);