diff options
| author | Matthew Hoops | 2012-07-29 14:27:03 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-29 14:31:36 -0400 |
| commit | e58724a180b965e16eec816fd6bcb2bb71607307 (patch) | |
| tree | ad90a213e01926ec0b33b7430c3f5e85d60921a3 /engines/mohawk/myst_stacks | |
| parent | 5fcf8c268167667c88a977ad243a7582bbf412e5 (diff) | |
| download | scummvm-rg350-e58724a180b965e16eec816fd6bcb2bb71607307.tar.gz scummvm-rg350-e58724a180b965e16eec816fd6bcb2bb71607307.tar.bz2 scummvm-rg350-e58724a180b965e16eec816fd6bcb2bb71607307.zip | |
MOHAWK: Remove Myst ME Macintosh "support"
The Mac version of Myst ME is actually not Mohawk and is instead closer to the engine used in Myst3.
Diffstat (limited to 'engines/mohawk/myst_stacks')
| -rw-r--r-- | engines/mohawk/myst_stacks/intro.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/engines/mohawk/myst_stacks/intro.cpp b/engines/mohawk/myst_stacks/intro.cpp index a5f608dbbf..545b97d956 100644 --- a/engines/mohawk/myst_stacks/intro.cpp +++ b/engines/mohawk/myst_stacks/intro.cpp @@ -100,12 +100,8 @@ void Intro::introMovies_run() { switch (_introStep) { case 0: - // Play the Mattel (or UbiSoft) logo in the Myst ME Mac version - if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) { - _vm->_video->playMovie(_vm->wrapMovieFilename("mattel", kIntroStack)); - _introStep = 1; - } else - _introStep = 2; + _introStep = 1; + _vm->_video->playMovie(_vm->wrapMovieFilename("broder", kIntroStack)); break; case 1: if (!_vm->_video->isVideoPlaying()) @@ -113,10 +109,7 @@ void Intro::introMovies_run() { break; case 2: _introStep = 3; - if ((_vm->getFeatures() & GF_ME) && _vm->getPlatform() == Common::kPlatformMacintosh) - _vm->_video->playMovie(_vm->wrapMovieFilename("presto", kIntroStack)); - else - _vm->_video->playMovie(_vm->wrapMovieFilename("broder", kIntroStack)); + _vm->_video->playMovie(_vm->wrapMovieFilename("cyanlogo", kIntroStack)); break; case 3: if (!_vm->_video->isVideoPlaying()) @@ -124,21 +117,13 @@ void Intro::introMovies_run() { break; case 4: _introStep = 5; - _vm->_video->playMovie(_vm->wrapMovieFilename("cyanlogo", kIntroStack)); - break; - case 5: - if (!_vm->_video->isVideoPlaying()) - _introStep = 6; - break; - case 6: - _introStep = 7; if (!(_vm->getFeatures() & GF_DEMO)) // The demo doesn't have the intro video _vm->_video->playMovie(_vm->wrapMovieFilename("intro", kIntroStack)); break; - case 7: + case 5: if (!_vm->_video->isVideoPlaying()) - _introStep = 8; + _introStep = 6; break; default: if (_vm->getFeatures() & GF_DEMO) |