diff options
| author | Max Horn | 2008-11-21 12:17:35 +0000 |
|---|---|---|
| committer | Max Horn | 2008-11-21 12:17:35 +0000 |
| commit | a28b531ed0a984aa89a6cbc55c0314ad52f304fb (patch) | |
| tree | 492d7aae224da496b3d3f176833da02c617bb0f9 /engines | |
| parent | 33dd58ca9894676c52498498eb5d19e48e3cc998 (diff) | |
| download | scummvm-rg350-a28b531ed0a984aa89a6cbc55c0314ad52f304fb.tar.gz scummvm-rg350-a28b531ed0a984aa89a6cbc55c0314ad52f304fb.tar.bz2 scummvm-rg350-a28b531ed0a984aa89a6cbc55c0314ad52f304fb.zip | |
Added ArchiveMember::getDisplayName() method; changed ArchiveMember::getName() to always return a name compatible with Archive::openFile()
svn-id: r35139
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/resource_intern.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<Common::ArchiveMember> 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<Common::ArchiveMember> 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; |