[Scummvm-cvs-logs] scummvm master -> d8aaf40090ff32acf80e2433df57f7c74d126ab4
bluegr
md5 at scummvm.org
Sat Sep 10 13:05:44 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d8aaf40090 SCI: Fixed bug #3404466 - "ScummVM crashes when trying to add non-SCI resources file"
Commit: d8aaf40090ff32acf80e2433df57f7c74d126ab4
https://github.com/scummvm/scummvm/commit/d8aaf40090ff32acf80e2433df57f7c74d126ab4
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-10T03:47:02-07:00
Commit Message:
SCI: Fixed bug #3404466 - "ScummVM crashes when trying to add non-SCI resources file"
Changed paths:
engines/sci/resource.cpp
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 17a4af9..bdd7d66 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
More information about the Scummvm-git-logs
mailing list