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

If a resource map entry can't be read, retry with the volume version instead, if it's different than the map version

Browse source 
svn-id: r43755
This commit is contained in:
Filippos Karapetis 2009-08-26 09:38:51 +00:00
parent 6e469002dd
commit f128f49ea6
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/resource.cpp
View file

@ -1023,12 +1023,20 @@ int ResourceManager::readResourceMapSCI0(ResourceSource *map) {
// adding a new resource
if (_resMap.contains(resId) == false) {
res = new Resource;
res->file_offset = offset & (((~bMask) << 24) | 0xFFFFFF);
res->id = resId;
res->source = getVolume(map, offset >> bShift);
if (!res->source) {
warning("Could not get volume for resource %d, VolumeID %d", id, offset >> bShift);
if (_mapVersion != _volVersion) {
warning("Retrying with the detected volume version instead");
warning("Map version was: %d, retrying with: %d", _mapVersion, _volVersion);
_mapVersion = _volVersion;
bMask = (_mapVersion == kResVersionSci1Middle) ? 0xF0 : 0xFC;
bShift = (_mapVersion == kResVersionSci1Middle) ? 28 : 26;
res->source = getVolume(map, offset >> bShift);
}
}
res->file_offset = offset & (((~bMask) << 24) | 0xFFFFFF);
res->id = resId;
_resMap.setVal(resId, res);
}
} while (!file.eos());