diff options
author | Nicola Mettifogo | 2009-03-22 23:07:51 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2009-03-22 23:07:51 +0000 |
commit | 052a6ea1f904079f85854cac9d255b7934130b84 (patch) | |
tree | bcf0cd4310dab07a0f6d93dde0b620b890ef7e80 /engines/parallaction | |
parent | 77c97670a3cb57f5fb11e68a3d99be37f9507a08 (diff) | |
download | scummvm-rg350-052a6ea1f904079f85854cac9d255b7934130b84.tar.gz scummvm-rg350-052a6ea1f904079f85854cac9d255b7934130b84.tar.bz2 scummvm-rg350-052a6ea1f904079f85854cac9d255b7934130b84.zip |
Stop erroring out if mask or shadow files are missing: not all location/objects have them.
svn-id: r39620
Diffstat (limited to 'engines/parallaction')
-rw-r--r-- | engines/parallaction/disk_br.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 886519c115..200d180044 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -545,7 +545,11 @@ void AmigaDisk_br::loadMask(const char *name, MaskBuffer &buffer) { } debugC(1, kDebugDisk, "AmigaDisk_br::loadMask '%s'", name); - Common::SeekableReadStream *stream = openFile("msk/" + Common::String(name), ".msk"); + Common::SeekableReadStream *stream = tryOpenFile("msk/" + Common::String(name), ".msk"); + if (!stream) { + return; + } + ILBMDecoder decoder(stream, true); // TODO: the buffer is allocated by the caller, so a copy here is @@ -613,10 +617,10 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) { sName.deleteLastChar(); sName.deleteLastChar(); sName.deleteLastChar(); - stream = openFile("ras/" + sName + ".ras_shdw"); + stream = tryOpenFile("ras/" + sName + ".ras_shdw"); if (!stream) { - warning("Cannot find shadow file for '%s'\n", name); + debugC(9, kDebugDisk, "Cannot find shadow file for '%s'\n", name); } else { uint32 shadowWidth = ((surf->w + 15)/8) & ~1; uint32 shadowSize = shadowWidth * surf->h; |