diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/director/archive.cpp | 9 | ||||
| -rw-r--r-- | engines/director/director.cpp | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp index 1b6864943d..4d85d33d4a 100644 --- a/engines/director/archive.cpp +++ b/engines/director/archive.cpp @@ -29,10 +29,13 @@ namespace Director { Archive *DirectorEngine::createArchive() { - if (getVersion() < 4) { - return new RIFFArchive(); + if (getPlatform() == Common::kPlatformMacintosh) { + if (getVersion() < 4) + return new MacArchive(); + else + return new RIFXArchive(); } else { - return new RIFXArchive(); + return new RIFFArchive(); } } diff --git a/engines/director/director.cpp b/engines/director/director.cpp index d03236ebe1..f868c9ac0c 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -142,13 +142,13 @@ Common::HashMap<Common::String, Score *> DirectorEngine::loadMMMNames(Common::St for (Common::FSList::const_iterator i = movies.begin(); i != movies.end(); ++i) { debugC(2, kDebugLoading, "File: %s", i->getName().c_str()); if (Common::matchString(i->getName().c_str(), sharedMMMname, true)) { - loadSharedCastsFrom(i->getPath()); + loadSharedCastsFrom(i->getName()); continue; } Archive *arc = createArchive(); - arc->openFile(i->getPath()); + arc->openFile(i->getName()); Score *sc = new Score(this, arc); nameMap[sc->getMacName()] = sc; } |