diff options
| author | Filippos Karapetis | 2011-09-10 13:47:02 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2011-09-10 13:47:02 +0300 |
| commit | d8aaf40090ff32acf80e2433df57f7c74d126ab4 (patch) | |
| tree | 216183576ea41e482fc4140fc592aa0ebd00acc7 /engines/sci | |
| parent | fa654e942adc5b7c6a01cd61c1d85dfdab4f8c14 (diff) | |
| download | scummvm-rg350-d8aaf40090ff32acf80e2433df57f7c74d126ab4.tar.gz scummvm-rg350-d8aaf40090ff32acf80e2433df57f7c74d126ab4.tar.bz2 scummvm-rg350-d8aaf40090ff32acf80e2433df57f7c74d126ab4.zip | |
SCI: Fixed bug #3404466 - "ScummVM crashes when trying to add non-SCI resources file"
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/resource.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 17a4af9c17..bdd7d6692b 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1158,8 +1158,10 @@ ResVersion ResourceManager::detectMapVersion() { } } - if (!fileStream) - error("Failed to open resource map file"); + if (!fileStream) { + warning("Failed to open resource map file"); + return kResVersionUnknown; + } // detection // SCI0 and SCI01 maps have last 6 bytes set to FF @@ -1259,7 +1261,7 @@ ResVersion ResourceManager::detectVolVersion() { } if (!fileStream) { - error("Failed to open volume file - if you got resource.p01/resource.p02/etc. files, merge them together into resource.000"); + warning("Failed to open volume file - if you got resource.p01/resource.p02/etc. files, merge them together into resource.000"); // resource.p01/resource.p02/etc. may be there when directly copying the files from the original floppies // the sierra installer would merge those together (perhaps we could do this as well?) // possible TODO |