diff options
| author | David Turner | 2010-02-14 19:01:02 +0000 |
|---|---|---|
| committer | David Turner | 2010-02-14 19:01:02 +0000 |
| commit | 384acffeb153d631b701de418c753503770f1b14 (patch) | |
| tree | 238b4cc0cb3694e6da55d64ac08dbb2597a6d2ee /engines/mohawk/myst.cpp | |
| parent | bf17ff87dbdd6e4e79785bff153dd96682601d98 (diff) | |
| download | scummvm-rg350-384acffeb153d631b701de418c753503770f1b14.tar.gz scummvm-rg350-384acffeb153d631b701de418c753503770f1b14.tar.bz2 scummvm-rg350-384acffeb153d631b701de418c753503770f1b14.zip | |
Mohawk : Corrected Myst Opcode 200/300 in Intro/Demo stack to correctly call Intro movies.
svn-id: r48062
Diffstat (limited to 'engines/mohawk/myst.cpp')
| -rw-r--r-- | engines/mohawk/myst.cpp | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index ba656171aa..f7b373b359 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -178,36 +178,10 @@ Common::Error MohawkEngine_Myst::run() { else changeToStack(kIntroStack); - if (getGameType() == GType_MAKINGOF) + if (getFeatures() & GF_DEMO) + changeToCard(2000); + else changeToCard(1); - else { - if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh) { - _video->playMovieCentered(wrapMovieFilename("mattel", kIntroStack)); - _video->playMovieCentered(wrapMovieFilename("presto", kIntroStack)); - } else - _video->playMovieCentered(wrapMovieFilename("broder", kIntroStack)); - - _video->playMovieCentered(wrapMovieFilename("cyanlogo", kIntroStack)); - - if (!(getFeatures() & GF_DEMO)) { // The demo doesn't have the intro video - if ((getFeatures() & GF_ME) && getPlatform() == Common::kPlatformMacintosh) - // intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same. - _video->playMovieCentered(wrapMovieFilename("introc", kIntroStack)); - else - _video->playMovieCentered(wrapMovieFilename("intro", kIntroStack)); - } - - if (shouldQuit()) - return Common::kNoError; - - if (getFeatures() & GF_DEMO) - changeToCard(2001); - else { - // It should be card 1 for the full game eventually too, but it's not working - // there at the moment. Card 2 is the card with the book on the ground. - changeToCard(2); - } - } // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && !(getFeatures() & GF_DEMO)) { |