diff options
| author | Johannes Schickel | 2006-07-15 20:37:32 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2006-07-15 20:37:32 +0000 |
| commit | ea0e3a806c4de7fc30cd5f5324bf339e01ca9e80 (patch) | |
| tree | e3b36ab3b99cfe54cbdfb8f2e2e927c87226b9d4 | |
| parent | d630b3e722f58d008ead016f46fc8ae459fcb1db (diff) | |
| download | scummvm-rg350-ea0e3a806c4de7fc30cd5f5324bf339e01ca9e80.tar.gz scummvm-rg350-ea0e3a806c4de7fc30cd5f5324bf339e01ca9e80.tar.bz2 scummvm-rg350-ea0e3a806c4de7fc30cd5f5324bf339e01ca9e80.zip | |
Get rid of some asserts and adds error messages instead.
svn-id: r23513
| -rw-r--r-- | engines/kyra/resource.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index e0a9818891..11b119ea16 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -51,7 +51,8 @@ Resource::Resource(KyraEngine *engine) { // only VRM file we need in the *whole* game for kyra1 if (_engine->features() & GF_TALKIE) { - assert(loadPakFile("CHAPTER1.VRM")); + if !(loadPakFile("CHAPTER1.VRM")) + error("couldn't open pakfile 'CHAPTER1.VRM'"); } } else if (_engine->game() == GI_KYRA3) { // load the installation package file for kyra3 @@ -71,7 +72,9 @@ Resource::Resource(KyraEngine *engine) { for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) { if (file->displayName().hasSuffix("PAK") || file->displayName().hasSuffix("APK")) { - assert(loadPakFile(file->displayName())); + if (loadPakFile(file->displayName()) { + error("couldn't open pakfile '%s'", file->displayName().c_str()); + } } } } |