libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 11:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Allow sounds with empty channels

Browse Source 
Occurs in fan games such as SQ4 Update
This commit is contained in:
sluicebox 2021-05-21 02:29:37 -06:00
parent 7170e2f4af
commit 0959489b49
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/sci/resource/resource_audio.cpp
View File

@ -854,8 +854,6 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
_tracks = new Track[_trackCount];
data = *_resource;
byte channelCount;
for (int trackNr = 0; trackNr < _trackCount; trackNr++) {
// Track info starts with track type:BYTE
// Then the channel information gets appended Unknown:WORD, ChannelOffset:WORD, ChannelSize:WORD
@ -865,11 +863,10 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
_tracks[trackNr].type = *data++;
// Counting # of channels used
SciSpan<const byte> data2 = data;
channelCount = 0;
byte channelCount = 0;
while (*data2 != 0xFF) {
data2 += 6;
channelCount++;
_tracks[trackNr].channelCount++;
}
_tracks[trackNr].channels = new Channel[channelCount];
_tracks[trackNr].channelCount = 0;
@ -897,6 +894,12 @@ SoundResource::SoundResource(uint32 resourceNr, ResourceManager *resMan, SciVers
size = _resource->size() - dataOffset;
}
if (size == 0) {
warning("Empty channel in sound resource %d: track %d, channel %d", resourceNr, trackNr, channelNr);
data += 6;
continue;
}
channel->data = _resource->subspan(dataOffset, size);
channel->curPos = 0;