diff options
| author | Travis Howell | 2008-07-29 04:00:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2008-07-29 04:00:07 +0000 |
| commit | fd40cb43427ea26836e967a866124d74aa854e9a (patch) | |
| tree | 3c64b0ee87c10c977df0018183bde520e7196da7 /engines/parallaction | |
| parent | c8400e97251ce8d494bb102f9dd4706ac1dc6b7d (diff) | |
| download | scummvm-rg350-fd40cb43427ea26836e967a866124d74aa854e9a.tar.gz scummvm-rg350-fd40cb43427ea26836e967a866124d74aa854e9a.tar.bz2 scummvm-rg350-fd40cb43427ea26836e967a866124d74aa854e9a.zip | |
Add check common directories, in loadScenery() for Amiga version of BRA.
svn-id: r33393
Diffstat (limited to 'engines/parallaction')
| -rw-r--r-- | engines/parallaction/disk_br.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 4de3048a1f..a5c5a51306 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -598,7 +598,11 @@ void AmigaDisk_br::loadScenery(BackgroundInfo& info, const char* name, const cha 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 @@ void AmigaDisk_br::loadScenery(BackgroundInfo& info, const char* name, const cha 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 @@ void AmigaDisk_br::loadScenery(BackgroundInfo& info, const char* name, const cha 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 |