diff options
| author | Bastien Bouclet | 2011-08-07 15:36:26 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2011-08-07 16:54:20 +0200 |
| commit | 216d3c5cefc6537a6705dfce91e4b77029a58666 (patch) | |
| tree | 2cbdde8d2d1ca03a107f262ff1f02b1bd3dd6ef3 | |
| parent | b15ad58f1192b6f8d521b92bf5c3eba321c675c2 (diff) | |
| download | scummvm-rg350-216d3c5cefc6537a6705dfce91e4b77029a58666.tar.gz scummvm-rg350-216d3c5cefc6537a6705dfce91e4b77029a58666.tar.bz2 scummvm-rg350-216d3c5cefc6537a6705dfce91e4b77029a58666.zip | |
MOHAWK: Leaving from the slides should go to the information screens in Myst Demo.
| -rw-r--r-- | engines/mohawk/console.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/myst_stacks/slides.cpp | 15 | ||||
| -rw-r--r-- | engines/mohawk/myst_stacks/slides.h | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/engines/mohawk/console.cpp b/engines/mohawk/console.cpp index e7dc84606c..0234c86c7e 100644 --- a/engines/mohawk/console.cpp +++ b/engines/mohawk/console.cpp @@ -117,7 +117,7 @@ static const char *mystStackNames[12] = { static const uint16 default_start_card[12] = { 3137, 10000, - 2001, // TODO: Should be 2000? + 2000, 5038, 2, // TODO: Should be 1? 1, diff --git a/engines/mohawk/myst_stacks/slides.cpp b/engines/mohawk/myst_stacks/slides.cpp index 72b299ee6d..9c00ded665 100644 --- a/engines/mohawk/myst_stacks/slides.cpp +++ b/engines/mohawk/myst_stacks/slides.cpp @@ -59,23 +59,20 @@ void Slides::disablePersistentScripts() { void Slides::runPersistentScripts() { if (_cardSwapEnabled) { // Used on Cards... - if (_vm->_system->getMillis() - _lastCardTime >= 2 * 1000) + if (_vm->_system->getMillis() > _nextCardTime) _vm->changeToCard(_nextCardID, true); } } void Slides::o_returnToMenu(uint16 op, uint16 var, uint16 argc, uint16 *argv) { - _vm->changeToStack(kDemoStack, 2001, 0, 0); + // Go to the information screens of the menu + _vm->changeToStack(kDemoStack, 2002, 0, 0); } void Slides::o_setCardSwap(uint16 op, uint16 var, uint16 argc, uint16 *argv) { - // Used on Cards... - if (argc == 1) { - _nextCardID = argv[0]; - _lastCardTime = _vm->_system->getMillis(); - _cardSwapEnabled = true; - } else - unknown(op, var, argc, argv); + _nextCardID = argv[0]; + _nextCardTime = _vm->_system->getMillis() + 5000; + _cardSwapEnabled = true; } } // End of namespace MystStacks diff --git a/engines/mohawk/myst_stacks/slides.h b/engines/mohawk/myst_stacks/slides.h index 8bc61d0e24..9fb76728b6 100644 --- a/engines/mohawk/myst_stacks/slides.h +++ b/engines/mohawk/myst_stacks/slides.h @@ -52,7 +52,7 @@ private: bool _cardSwapEnabled; uint16 _nextCardID; - uint32 _lastCardTime; + uint32 _nextCardTime; }; } // End of namespace MystStacks |