thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: channels[] work, sci0 fading still not working (volume is changed though)

Browse source 
svn-id: r46969
This commit is contained in:
Martin Kiewitz 2010-01-04 13:21:35 +00:00
parent 50245ba571
commit 01ebbcf101
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/sci/resource.cpp
View file

@ -1894,7 +1894,7 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi
_tracks = new Track[_trackCount];
_tracks->digitalChannelNr = -1;
_tracks->type = TRACKTYPE_NONE;
_tracks->channelCount = 1;
_tracks->channelCount = 16;
// Digital sample data included? -> Add an additional channel
if (resource->data[0] == 2)
_tracks->channelCount++;
@ -1908,10 +1908,17 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi
channel->data = resource->data + 0x21;
channel->size = resource->size - 0x21;
}
if (_tracks->channelCount == 2) {
data = resource->data + 1;
for (channelNr = 0; channelNr < 16; channelNr++) {
channel = &_tracks->channels[channelNr];
channel->number = channelNr;
channel->poly = *data >> 4;
data++;
}
if (_tracks->channelCount == 17) {
// Digital sample data included
_tracks->digitalChannelNr = 1;
sampleChannel = &_tracks->channels[1];
_tracks->digitalChannelNr = 16;
sampleChannel = &_tracks->channels[16];
// we need to find 0xFC (channel terminator) within the data
data = channel->data;
dataEnd = channel->data + channel->size;