[Scummvm-cvs-logs] SF.net SVN: scummvm: [26263] scummvm/trunk/engines/kyra/resource.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue Mar 20 21:46:20 CET 2007
Revision: 26263
http://scummvm.svn.sourceforge.net/scummvm/?rev=26263&view=rev
Author: lordhoto
Date: 2007-03-20 13:46:19 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
Little cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2007-03-20 20:46:09 UTC (rev 26262)
+++ scummvm/trunk/engines/kyra/resource.cpp 2007-03-20 20:46:19 UTC (rev 26263)
@@ -180,53 +180,45 @@
}
uint8 *Resource::fileData(const char *file, uint32 *size) {
- uint8 *buffer = 0;
- Common::File file_;
+ Common::File fileHandle;
if (size)
*size = 0;
// test to open it in the main dir
- if (file_.open(file)) {
-
- uint32 temp = file_.size();
- buffer = new uint8[temp];
+ if (fileHandle.open(file)) {
+ uint32 fileSize = fileHandle.size();
+ uint8 *buffer = new uint8[fileSize];
assert(buffer);
- file_.read(buffer, temp);
+ fileHandle.read(buffer, fileSize);
if (size)
- *size = temp;
+ *size = fileSize;
- file_.close();
+ return buffer;
} else {
// opens the file in a PAK File
Common::List<ResourceFile*>::iterator start = _pakfiles.begin();
uint fileHash = Common::hashit_lower(file);
- uint32 temp = 0;
for (;start != _pakfiles.end(); ++start) {
if (!(*start)->isOpen())
continue;
- temp = (*start)->getFileSize(fileHash);
+ uint32 fileSize = (*start)->getFileSize(fileHash);
- if (!temp)
+ if (!fileSize)
continue;
if (size)
- *size = temp;
+ *size = fileSize;
- buffer = (*start)->getFile(fileHash);
- break;
+ return (*start)->getFile(fileHash);
}
}
- if (!buffer) {
- return 0;
- }
-
- return buffer;
+ return 0;
}
bool Resource::getFileHandle(const char *file, uint32 *size, Common::File &filehandle) {
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