[Scummvm-cvs-logs] SF.net SVN: scummvm:[33393] scummvm/trunk/engines/parallaction/disk_br.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Tue Jul 29 06:00:08 CEST 2008
Revision: 33393
http://scummvm.svn.sourceforge.net/scummvm/?rev=33393&view=rev
Author: Kirben
Date: 2008-07-29 04:00:07 +0000 (Tue, 29 Jul 2008)
Log Message:
-----------
Add check common directories, in loadScenery() for Amiga version of BRA.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk_br.cpp
Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp 2008-07-29 03:14:35 UTC (rev 33392)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp 2008-07-29 04:00:07 UTC (rev 33393)
@@ -598,7 +598,11 @@
filepath = Common::String(name) + ".bkg";
node = _bkgDir.getChild(filepath);
if (!node.exists()) {
- errorFileNotFound(_bkgDir, filepath);
+ filepath = Common::String(name) + ".bkg";
+ node = _commonBkgDir.getChild(filepath);
+ if (!node.exists()) {
+ errorFileNotFound(_bkgDir, filepath);
+ }
}
stream.open(node);
loadBackground(info, stream);
@@ -609,7 +613,11 @@
filepath = Common::String(mask) + ".msk";
node = _mskDir.getChild(filepath);
if (!node.exists()) {
- errorFileNotFound(_mskDir, filepath);
+ filepath = Common::String(mask) + ".msk";
+ node = _commonMskDir.getChild(filepath);
+ if (!node.exists()) {
+ errorFileNotFound(_mskDir, filepath);
+ }
}
stream.open(node);
loadMask(info, stream);
@@ -620,7 +628,11 @@
filepath = Common::String(path) + ".pth";
node = _pthDir.getChild(filepath);
if (!node.exists()) {
- errorFileNotFound(_pthDir, filepath);
+ filepath = Common::String(path) + ".pth";
+ node = _commonPthDir.getChild(filepath);
+ if (!node.exists()) {
+ errorFileNotFound(_pthDir, filepath);
+ }
}
stream.open(node);
// NOTE: info.width and info.height are only valid if the background graphics
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list