aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource_audio.cpp
diff options
context:
space:
mode:
authorWalter van Niftrik2010-09-09 23:01:51 +0000
committerWalter van Niftrik2010-09-09 23:01:51 +0000
commit8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0 (patch)
tree513e73cbd9f95949c9e5d1c970afe19fb9268ef4 /engines/sci/resource_audio.cpp
parentf446dbc8d5e8cfa90dc90ea3034d9eb7b2252a84 (diff)
downloadscummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.tar.gz
scummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.tar.bz2
scummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.zip
SCI: Fix digital track regression from r52662.
svn-id: r52666
Diffstat (limited to 'engines/sci/resource_audio.cpp')
-rw-r--r--engines/sci/resource_audio.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 091f4f4423..4217ed1000 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -664,8 +664,9 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
channel->data = resource->data + dataOffset;
channel->size = READ_LE_UINT16(data + 4);
channel->curPos = 0;
- channel->number = *channel->data & 0xf;
- channel->isRhythm = *channel->data & 0x20;
+ // FIXME: number contains (low nibble) channel and (high nibble) flags
+ // 0x20 is set on rhythm channels to prevent remapping
+ channel->number = *channel->data;
channel->poly = *(channel->data + 1);
channel->time = channel->prev = 0;
channel->data += 2; // skip over header