[Scummvm-cvs-logs] SF.net SVN: scummvm: [27811] scummvm/branches/branch-0-10-0/engines/kyra/ resource.cpp
agent-q at users.sourceforge.net
agent-q at users.sourceforge.net
Sun Jul 1 03:06:18 CEST 2007
Revision: 27811
http://scummvm.svn.sourceforge.net/scummvm/?rev=27811&view=rev
Author: agent-q
Date: 2007-06-30 18:06:18 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Optimising resource loading for kyra
Modified Paths:
--------------
scummvm/branches/branch-0-10-0/engines/kyra/resource.cpp
Modified: scummvm/branches/branch-0-10-0/engines/kyra/resource.cpp
===================================================================
--- scummvm/branches/branch-0-10-0/engines/kyra/resource.cpp 2007-07-01 01:03:21 UTC (rev 27810)
+++ scummvm/branches/branch-0-10-0/engines/kyra/resource.cpp 2007-07-01 01:06:18 UTC (rev 27811)
@@ -195,15 +195,22 @@
if (!(*cur)->isOpen())
continue;
- uint32 fileSize = (*cur)->getFileSize(fileHash);
- if (!fileSize)
- continue;
+ uint8* result = (*cur)->getFile(fileHash);
- if (size)
- *size = fileSize;
+ if (result) {
+ uint32 fileSize = (*cur)->getFileSize(fileHash);
- return (*cur)->getFile(fileHash);
+ if (!fileSize)
+ continue;
+
+ if (size)
+ *size = fileSize;
+
+ return result;
+ }
+
+
}
}
@@ -221,13 +228,15 @@
if (!(*start)->isOpen())
continue;
- *size = (*start)->getFileSize(fileHash);
+ if ((*start)->getFileHandle(fileHash, filehandle)) {
+
+ *size = (*start)->getFileSize(fileHash);
- if (!(*size))
- continue;
+ if (!(*size))
+ continue;
- if ((*start)->getFileHandle(fileHash, filehandle))
return true;
+ }
}
return false;
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