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

SCI: Improve speed of Mac resource fork sources

Browse source 
svn-id: r55859
This commit is contained in:
Matthew Hoops 2011-02-09 17:54:34 +00:00
parent dc4dd174af
commit aac6bd5181
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
engines/sci/resource.cpp
View file

@ -1849,16 +1849,6 @@ void MacResourceForkResourceSource::scanSource(ResourceManager *resMan) {
Common::MacResIDArray idArray = _macResMan->getResIDArray(tagArray[i]); Common::MacResIDArray idArray = _macResMan->getResIDArray(tagArray[i]);
for (uint32 j = 0; j < idArray.size(); j++) { for (uint32 j = 0; j < idArray.size(); j++) {
// Get the size of the file
Common::SeekableReadStream *stream = _macResMan->getResource(tagArray[i], idArray[j]);
// Some IBIS resources have a size of 0, so we skip them
if (!stream)
continue;
uint32 fileSize = stream->size();
delete stream;
ResourceId resId; ResourceId resId;
// Check to see if we've got a base36 encoded resource name // Check to see if we've got a base36 encoded resource name
@ -1885,7 +1875,8 @@ void MacResourceForkResourceSource::scanSource(ResourceManager *resMan) {
} }
// Overwrite Resource instance. Resource forks may contain patches. // Overwrite Resource instance. Resource forks may contain patches.
resMan->updateResource(resId, this, fileSize); // The size will be filled in later by decompressResource()
resMan->updateResource(resId, this, 0);
} }
} }
} }
@ -1954,15 +1945,6 @@ int Resource::readResourceInfo(ResVersion volVersion, Common::SeekableReadStream
szUnpacked = file->readUint16LE(); szUnpacked = file->readUint16LE();
wCompression = file->readUint16LE(); wCompression = file->readUint16LE();
break; break;
case kResVersionSci11Mac:
// Doesn't store this data in the resource. Fortunately,
// we already have this data.
type = getType();
number = getNumber();
szPacked = file->size();
szUnpacked = file->size();
wCompression = 0;
break;
#ifdef ENABLE_SCI32 #ifdef ENABLE_SCI32
case kResVersionSci2: case kResVersionSci2:
case kResVersionSci3: case kResVersionSci3: