[Scummvm-cvs-logs] SF.net SVN: scummvm: [23852] scummvm/trunk/engines/kyra/resource.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Sep 9 19:10:14 CEST 2006
Revision: 23852
http://svn.sourceforge.net/scummvm/?rev=23852&view=rev
Author: fingolfin
Date: 2006-09-09 10:10:09 -0700 (Sat, 09 Sep 2006)
Log Message:
-----------
Get rid of fsnode hack
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2006-09-09 16:48:35 UTC (rev 23851)
+++ scummvm/trunk/engines/kyra/resource.cpp 2006-09-09 17:10:09 UTC (rev 23852)
@@ -70,11 +70,11 @@
}
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
- Common::String filename = file->path();
+ Common::String filename = file->name();
filename.toUppercase();
if (filename.hasSuffix("PAK") || filename.hasSuffix("APK")) {
- if (!loadPakFile(file->path())) {
- error("couldn't open pakfile '%s'", file->path().c_str());
+ if (!loadPakFile(file->name())) {
+ error("couldn't open pakfile '%s'", file->name().c_str());
}
}
}
@@ -102,19 +102,17 @@
}
PAKFile *file = 0;
- FilesystemNode *fsNode = new FilesystemNode(ConfMan.get("path") + filename);
if (handle.name() == filename) {
- file = new PAKFile(fsNode->name().c_str(), handle.name(), (_engine->features() & GF_AMIGA) != 0);
+ file = new PAKFile(filename.c_str(), handle.name(), (_engine->features() & GF_AMIGA) != 0);
} else {
uint32 offset = handle.pos();
uint8 *buf = new uint8[size];
handle.read(buf, size);
- file = new PAKFile(fsNode->name().c_str(), handle.name(), offset, buf, size, (_engine->features() & GF_AMIGA) != 0);
+ file = new PAKFile(filename.c_str(), handle.name(), offset, buf, size, (_engine->features() & GF_AMIGA) != 0);
delete [] buf;
}
handle.close();
- delete fsNode;
if (!file)
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