[Scummvm-cvs-logs] SF.net SVN: scummvm:[55859] scummvm/trunk/engines/sci/resource.cpp
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Wed Feb 9 18:54:34 CET 2011
Revision: 55859
http://scummvm.svn.sourceforge.net/scummvm/?rev=55859&view=rev
Author: mthreepwood
Date: 2011-02-09 17:54:34 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
SCI: Improve speed of Mac resource fork sources
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.cpp
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2011-02-09 11:44:07 UTC (rev 55858)
+++ scummvm/trunk/engines/sci/resource.cpp 2011-02-09 17:54:34 UTC (rev 55859)
@@ -1849,16 +1849,6 @@
Common::MacResIDArray idArray = _macResMan->getResIDArray(tagArray[i]);
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;
// Check to see if we've got a base36 encoded resource name
@@ -1885,7 +1875,8 @@
}
// 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 @@
szUnpacked = file->readUint16LE();
wCompression = file->readUint16LE();
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
case kResVersionSci2:
case kResVersionSci3:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list