libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 05:34:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix C64 targets. Regression.

Browse Source 
svn-id: r18411
This commit is contained in:
Eugene Sandulenko 2005-06-19 18:16:27 +00:00
parent 97337c4623
commit 1844a9c544
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scumm/resource.cpp
View File

@ -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);
}

12
scumm/scumm.cpp
View File

@ -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