[Scummvm-cvs-logs] SF.net SVN: scummvm:[39620] scummvm/trunk/engines/parallaction/disk_br.cpp

[peres001 at users.sourceforge.net]

Revision: 39620
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39620&view=rev
Author:   peres001
Date:     2009-03-22 23:07:51 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
Stop erroring out if mask or shadow files are missing: not all location/objects have them.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/disk_br.cpp

Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp	2009-03-22 23:07:08 UTC (rev 39619)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp	2009-03-22 23:07:51 UTC (rev 39620)
@@ -545,7 +545,11 @@
 	}
 	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 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.