diff options
| author | Eugene Sandulenko | 2005-06-19 18:16:27 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-06-19 18:16:27 +0000 |
| commit | 1844a9c5449108537b5ec19bf618b17420d995aa (patch) | |
| tree | df0732c6bc07ff2b8b06ab72ca0b50598e31f5ce | |
| parent | 97337c46238d3e6ebd2a792d03bd6990c5775d03 (diff) | |
| download | scummvm-rg350-1844a9c5449108537b5ec19bf618b17420d995aa.tar.gz scummvm-rg350-1844a9c5449108537b5ec19bf618b17420d995aa.tar.bz2 scummvm-rg350-1844a9c5449108537b5ec19bf618b17420d995aa.zip | |
Fix C64 targets. Regression.
svn-id: r18411
| -rw-r--r-- | scumm/resource.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index e8c22d6124..b79b575d37 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -139,7 +139,7 @@ void ScummEngine::openRoom(const int room) { } // If we have substitute - if (_substResFileNameIndex > 0 && !(_platform == Common::kPlatformNES)) { + if (_substResFileNameIndex > 0 && !(_platform == Common::kPlatformNES || _platform == Common::kPlatformC64)) { char tmpBuf[128]; generateSubstResFileName(buf, tmpBuf, sizeof(tmpBuf)); @@ -230,7 +230,7 @@ bool ScummEngine::openFile(BaseScummFile &file, const char *filename) { file.close(); file.open(_containerFile.c_str()); assert(file.isOpen()); - + result = file.openSubFile(filename); } diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 6a5461a4c1..7c4138bc5e 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -583,10 +583,10 @@ static SubstResFileNames substResFileNameTable[] = { { "00.LFL", "Maniac Mansion (F).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (SW).prg", kGenAsIs }, { "00.LFL", "Maniac Mansion (U).prg", kGenAsIs }, - { "00.LFL", "maniac1.d64", kGenAsIs }, - { "00.LFL", "zak1.d64", kGenAsIs }, - { "01.LFL", "maniac2.d64", kGenAsIs }, - { "01.LFL", "zak2.d64", kGenAsIs }, + { "00.LFL", "maniac1.d64", kGenAsIs }, // Do not + { "01.LFL", "maniac2.d64", kGenAsIs }, // swap + { "00.LFL", "zak1.d64", kGenAsIs }, // these + { "01.LFL", "zak2.d64", kGenAsIs }, // lines { "airdemo", "Airport Demo", kGenMac}, { "balloon", "Balloon-O-Rama", kGenMac}, { "baseball", "BaseBall", kGenMac}, @@ -1600,9 +1600,9 @@ int ScummEngine::init(GameDetector &detector) { _imuse->setBase(res.address[rtSound]); } - // Since MM NES substitutes whole file class we get monster.sou file + // Since MM NES and C64 targets substitute whole file class we get monster.sou file // name badly generated, so avoid even attempts to open it - if (!(_platform == Common::kPlatformNES)) + if (!((_platform == Common::kPlatformNES) || (_platform == Common::kPlatformC64))) _sound->setupSound(); // Create debugger |