[Scummvm-cvs-logs] SF.net SVN: scummvm: [23800] scummvm/trunk/engines/kyra

[vinterstum at users.sourceforge.net]

Revision: 23800
Author:   vinterstum
Date:     2006-08-28 11:43:35 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23800&view=rev

Log Message:
-----------
Makes sure FilesystemNode::name isn't used to open a file, use a regular filehandle name instead.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp
    scummvm/trunk/engines/kyra/resource.h
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2006-08-28 14:21:23 UTC (rev 23799)
+++ scummvm/trunk/engines/kyra/resource.cpp	2006-08-28 18:43:35 UTC (rev 23800)
@@ -105,7 +105,7 @@
 	PAKFile *file = 0;
 
 	if (handle.name() == filename) {
-		file = new PAKFile(fsNode->name().c_str(), (_engine->features() & GF_AMIGA) != 0);
+		file = new PAKFile(fsNode->name().c_str(), handle.name(), (_engine->features() & GF_AMIGA) != 0);
 	} else {
 		uint32 offset = handle.pos();
 		uint8 *buf = new uint8[size];
@@ -252,7 +252,7 @@
 ///////////////////////////////////////////
 // Pak file manager
 #define PAKFile_Iterate Common::List<PakChunk>::iterator start=_files.begin();start != _files.end(); ++start
-PAKFile::PAKFile(const char *file, bool isAmiga) : ResourceFile() {
+PAKFile::PAKFile(const char *file, const char *physfile, bool isAmiga) : ResourceFile() {
 	_isAmiga = isAmiga;
 
 	Common::File pakfile;
@@ -316,7 +316,7 @@
 	delete [] buffer;
 	
 	_filename = file;
-	_physfile = "";
+	_physfile = physfile;
 }
 
 PAKFile::PAKFile(const char *file, const char *physfile, const uint32 off, const uint8 *buffer, uint32 filesize, bool isAmiga) : ResourceFile() {

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2006-08-28 14:21:23 UTC (rev 23799)
+++ scummvm/trunk/engines/kyra/resource.h	2006-08-28 18:43:35 UTC (rev 23800)
@@ -60,7 +60,7 @@
 	};
 
 public:
-	PAKFile(const char *file, bool isAmiga = false);
+	PAKFile(const char *file, const char *physfile, bool isAmiga = false);
 	PAKFile(const char *file, const char *physfile, const uint32 off, const uint8 *buf, uint32 size, bool isAmiga = false);
 	~PAKFile();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.