diff options
| author | Walter van Niftrik | 2010-09-09 23:01:51 +0000 |
|---|---|---|
| committer | Walter van Niftrik | 2010-09-09 23:01:51 +0000 |
| commit | 8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0 (patch) | |
| tree | 513e73cbd9f95949c9e5d1c970afe19fb9268ef4 | |
| parent | f446dbc8d5e8cfa90dc90ea3034d9eb7b2252a84 (diff) | |
| download | scummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.tar.gz scummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.tar.bz2 scummvm-rg350-8bbbcfe5b8f4c7099d83610c83fe51014e43b6d0.zip | |
SCI: Fix digital track regression from r52662.
svn-id: r52666
| -rw-r--r-- | engines/sci/resource.h | 1 | ||||
| -rw-r--r-- | engines/sci/resource_audio.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/resource.h b/engines/sci/resource.h index 8dc96bc3a9..53c00f6ec0 100644 --- a/engines/sci/resource.h +++ b/engines/sci/resource.h @@ -512,7 +512,6 @@ class SoundResource { public: struct Channel { byte number; - bool isRhythm; byte poly; uint16 prio; uint16 size; 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 |