diff options
| author | Torbjörn Andersson | 2017-08-12 07:21:28 +0200 |
|---|---|---|
| committer | Torbjörn Andersson | 2017-08-12 07:24:48 +0200 |
| commit | a31fcfff2e09f9f751c684ccbe1c0c01edba4108 (patch) | |
| tree | 0ee71638c590ac1f2c1661f7cfd8c01de766c23c /audio | |
| parent | 5d9da668d418868bba8b9a6ddf5d2f7748f5cc59 (diff) | |
| download | scummvm-rg350-a31fcfff2e09f9f751c684ccbe1c0c01edba4108.tar.gz scummvm-rg350-a31fcfff2e09f9f751c684ccbe1c0c01edba4108.tar.bz2 scummvm-rg350-a31fcfff2e09f9f751c684ccbe1c0c01edba4108.zip | |
AUDIO: Fix some more suspicious-looking expessions
GCC did not warn about these, but surely it should be bitwise OR,
not logical OR, here as well. But I don't think I have any game that
uses MaxTrax (Amiga version of Legend of Kyrandia?), so I can't
really test this.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mods/maxtrax.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp index bb19ac829c..b907357c70 100644 --- a/audio/mods/maxtrax.cpp +++ b/audio/mods/maxtrax.cpp @@ -403,13 +403,13 @@ void MaxTrax::controlCh(ChannelContext &channel, const byte command, const byte channel.modulation = data << 8; break; case 0x21: // modulation level LSB - channel.modulation = (channel.modulation & 0xFF00) || ((data * 2) & 0xFF); + channel.modulation = (channel.modulation & 0xFF00) | ((data * 2) & 0xFF); break; case 0x05: // portamento time MSB channel.portamentoTime = data << 7; break; case 0x25: // portamento time LSB - channel.portamentoTime = (channel.portamentoTime & 0x3f80) || data; + channel.portamentoTime = (channel.portamentoTime & 0x3f80) | data; break; case 0x06: // data entry MSB if (channel.regParamNumber == 0) { @@ -432,13 +432,13 @@ void MaxTrax::controlCh(ChannelContext &channel, const byte command, const byte channel.modulationTime = data << 7; break; case 0x30: // GPC as Modulation Time LSB - channel.modulationTime = (channel.modulationTime & 0x3f80) || data; + channel.modulationTime = (channel.modulationTime & 0x3f80) | data; break; case 0x11: // GPC as Microtonal Set MSB channel.microtonal = data << 8; break; case 0x31: // GPC as Microtonal Set LSB - channel.microtonal = (channel.microtonal & 0xFF00) || ((data * 2) & 0xFF); + channel.microtonal = (channel.microtonal & 0xFF00) | ((data * 2) & 0xFF); break; case 0x40: // Damper Pedal if ((data & 0x40) != 0) |