diff options
| author | Eugene Sandulenko | 2017-02-08 01:29:09 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-02-08 01:29:38 +0100 |
| commit | f0f6915e5238063b83ef2d15482c64039c4b2756 (patch) | |
| tree | 803aaaf0ea46704bf2e997bdaa3e216410f0d4c7 /engines | |
| parent | 8966d4f8fc5dad6715973e392371c191cce5310d (diff) | |
| download | scummvm-rg350-f0f6915e5238063b83ef2d15482c64039c4b2756.tar.gz scummvm-rg350-f0f6915e5238063b83ef2d15482c64039c4b2756.tar.bz2 scummvm-rg350-f0f6915e5238063b83ef2d15482c64039c4b2756.zip | |
DIRECTOR: Specify Shared Cast name for D4+ Mac movies
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/director/director.cpp | 10 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/engines/director/director.cpp b/engines/director/director.cpp index ab45e921cf..d9bf8cd0cc 100644 --- a/engines/director/director.cpp +++ b/engines/director/director.cpp @@ -136,10 +136,14 @@ Common::Error DirectorEngine::run() { //_mainArchive = new RIFFArchive(); //_mainArchive->openFile("bookshelf_example.mmm"); - if (getPlatform() == Common::kPlatformWindows) + if (getPlatform() == Common::kPlatformWindows) { _sharedCastFile = "SHARDCST.MMM"; - else - _sharedCastFile = "Shared Cast"; + } else { + if (getVersion() < 3) + _sharedCastFile = "Shared Cast"; + else + _sharedCastFile = "Shared.dir"; + } loadSharedCastsFrom(_sharedCastFile); diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 552030a155..905c6e7dc3 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -1161,12 +1161,6 @@ void Lingo::b_moveToFront(int nargs) { g_lingo->dropStack(nargs); } -void Lingo::b_window(int nargs) { - g_lingo->printSTUBWithArglist("b_window", nargs); - g_lingo->dropStack(nargs); - g_lingo->push(Datum(0)); -} - /////////////////// // Point @@ -1349,5 +1343,11 @@ void Lingo::b_me(int nargs) { g_lingo->dropStack(nargs); } +void Lingo::b_window(int nargs) { + g_lingo->printSTUBWithArglist("b_window", nargs); + g_lingo->dropStack(nargs); + g_lingo->push(Datum(0)); +} + } // End of namespace Director |