[Scummvm-git-logs] scummvm master -> 859b54222f8532deefdecb3e655f3312b66d6b8d
sev-
sev at scummvm.org
Fri Aug 11 21:53:19 CEST 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c48cb7af7c JANITORIAL: Add fall through statement
859b54222f AUDIO: Fix incorrect boolean statement in MaxTrax decoder
Commit: c48cb7af7caea4cbe4867bbb9f7e6c2f4d087bc2
https://github.com/scummvm/scummvm/commit/c48cb7af7caea4cbe4867bbb9f7e6c2f4d087bc2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T21:40:11+02:00
Commit Message:
JANITORIAL: Add fall through statement
Changed paths:
image/codecs/rpza.cpp
diff --git a/image/codecs/rpza.cpp b/image/codecs/rpza.cpp
index db0d512..411ddd2 100644
--- a/image/codecs/rpza.cpp
+++ b/image/codecs/rpza.cpp
@@ -270,6 +270,7 @@ static inline void decodeFrameTmpl(Common::SeekableReadStream &stream, PixelInt
// Fill blocks with 4 colors
case 0xc0:
colorA = stream.readUint16BE();
+ // fall through
case 0x20:
colorB = stream.readUint16BE();
Commit: 859b54222f8532deefdecb3e655f3312b66d6b8d
https://github.com/scummvm/scummvm/commit/859b54222f8532deefdecb3e655f3312b66d6b8d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-08-11T21:52:44+02:00
Commit Message:
AUDIO: Fix incorrect boolean statement in MaxTrax decoder
Changed paths:
audio/mods/maxtrax.cpp
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index b0cdaef..bb19ac8 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);
More information about the Scummvm-git-logs
mailing list