diff options
| author | Bastien Bouclet | 2010-11-29 21:02:39 +0000 |
|---|---|---|
| committer | Bastien Bouclet | 2010-11-29 21:02:39 +0000 |
| commit | 29359ee3722a317532f8b7930f8f33ba01cec74e (patch) | |
| tree | ab36f25ae1beb0bb330a420c8049e24b9a180ec7 | |
| parent | 278b8a142952ce041e5fdf9513b18f0e0549ce27 (diff) | |
| download | scummvm-rg350-29359ee3722a317532f8b7930f8f33ba01cec74e.tar.gz scummvm-rg350-29359ee3722a317532f8b7930f8f33ba01cec74e.tar.bz2 scummvm-rg350-29359ee3722a317532f8b7930f8f33ba01cec74e.zip | |
MOHAWK: Set the initial stack back to the intro
svn-id: r54644
| -rw-r--r-- | engines/mohawk/myst.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/myst_scripts_myst.cpp | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp index 14a2d96040..a44cee745f 100644 --- a/engines/mohawk/myst.cpp +++ b/engines/mohawk/myst.cpp @@ -250,12 +250,12 @@ Common::Error MohawkEngine_Myst::run() { else if (getFeatures() & GF_DEMO) changeToStack(kDemoStack); else - changeToStack(kSeleniticStack); + changeToStack(kIntroStack); if (getFeatures() & GF_DEMO) changeToCard(2000, true); else - changeToCard(1285, true); + changeToCard(1, true); // Load game from launcher/command line if requested if (ConfMan.hasKey("save_slot") && !(getFeatures() & GF_DEMO)) { diff --git a/engines/mohawk/myst_scripts_myst.cpp b/engines/mohawk/myst_scripts_myst.cpp index 8bcf4dbc1b..f63aa839d4 100644 --- a/engines/mohawk/myst_scripts_myst.cpp +++ b/engines/mohawk/myst_scripts_myst.cpp @@ -2136,21 +2136,21 @@ void MystScriptParser_Myst::opcode_200(uint16 op, uint16 var, uint16 argc, uint1 // change is performed. // Play Intro Movies.. -// if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) { -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("mattel", kIntroStack)); -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("presto", kIntroStack)); -// } else -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("broder", kIntroStack)); -// -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("cyanlogo", kIntroStack)); -// -// if (!(_vm->getFeatures() & GF_DEMO)) { // The demo doesn't have the intro video -// if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) -// // intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same. -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("introc", kIntroStack)); -// else -// _vm->_video->playMovieCentered(_vm->wrapMovieFilename("intro", kIntroStack)); -// } + if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) { + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("mattel", kIntroStack)); + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("presto", kIntroStack)); + } else + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("broder", kIntroStack)); + + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("cyanlogo", kIntroStack)); + + if (!(_vm->getFeatures() & GF_DEMO)) { // The demo doesn't have the intro video + if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) + // intro.mov uses Sorenson, introc uses Cinepak. Otherwise, they're the same. + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("introc", kIntroStack)); + else + _vm->_video->playMovieCentered(_vm->wrapMovieFilename("intro", kIntroStack)); + } _vm->changeToCard(_vm->getCurCard()+1, true); break; |