From a28b531ed0a984aa89a6cbc55c0314ad52f304fb Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 21 Nov 2008 12:17:35 +0000 Subject: Added ArchiveMember::getDisplayName() method; changed ArchiveMember::getName() to always return a name compatible with Archive::openFile() svn-id: r35139 --- engines/kyra/resource_intern.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines') diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index cbb6dc4f0c..341f9a6735 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -229,7 +229,7 @@ Common::Archive *ResLoaderPak::load(Common::SharedPtr mem while (!stream.eos()) { // The start offset of a file should never be in the filelist if (startoffset < stream.pos() || startoffset > filesize) { - warning("PAK file '%s' is corrupted", memberFile->getName().c_str()); + warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str()); return false; } @@ -240,14 +240,14 @@ Common::Archive *ResLoaderPak::load(Common::SharedPtr mem file += c; if (stream.eos()) { - warning("PAK file '%s' is corrupted", memberFile->getName().c_str()); + warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str()); return false; } // Quit now if we encounter an empty string if (file.empty()) { if (firstFile) { - warning("PAK file '%s' is corrupted", memberFile->getName().c_str()); + warning("PAK file '%s' is corrupted", memberFile->getDisplayName().c_str()); return false; } else { break; -- cgit v1.2.3