aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorBertrand Augereau2003-08-13 22:45:22 +0000
committerBertrand Augereau2003-08-13 22:45:22 +0000
commit1a7bf49f34fbdfc771a5c8a69ee7f46062a7d8bd (patch)
treecf83bc18828da8c121e0f44ef0d99b54bdf4c2bd /scumm
parent830d1b702ad67793d21d311d994f9c2ec2ad543c (diff)
downloadscummvm-rg350-1a7bf49f34fbdfc771a5c8a69ee7f46062a7d8bd.tar.gz
scummvm-rg350-1a7bf49f34fbdfc771a5c8a69ee7f46062a7d8bd.tar.bz2
scummvm-rg350-1a7bf49f34fbdfc771a5c8a69ee7f46062a7d8bd.zip
Made Player::decode_sysex_bytes const-correct.
Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks. svn-id: r9673
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp
index 8547411b93..68b4f0931f 100644
--- a/scumm/imuse_player.cpp
+++ b/scumm/imuse_player.cpp
@@ -509,9 +509,9 @@ void Player::sysEx(byte *p, uint16 len) {
}
}
-void Player::decode_sysex_bytes(byte *src, byte *dst, int len) {
+void Player::decode_sysex_bytes(const byte *src, byte *dst, int len) {
while (len >= 0) {
- *dst++ = (src[0] << 4) |(src[1] & 0xF);
+ *dst++ = ((src[0] << 4)&0xFF) |(src[1] & 0xF);
src += 2;
len -= 2;
}