aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorBastien Bouclet2011-05-15 17:38:47 +0200
committerBastien Bouclet2011-05-15 17:41:55 +0200
commit9f05f8805dfda0892b809e268c2c4869ca33d4ff (patch)
treed5606439b8eec2a706186d3d42019847cff18189 /engines
parentaf9dc7a29cd982f73fb425776e6c5c0071df6912 (diff)
downloadscummvm-rg350-9f05f8805dfda0892b809e268c2c4869ca33d4ff.tar.gz
scummvm-rg350-9f05f8805dfda0892b809e268c2c4869ca33d4ff.tar.bz2
scummvm-rg350-9f05f8805dfda0892b809e268c2c4869ca33d4ff.zip
MOHAWK: Fix loading a Myst savegame from the launcher.
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/myst.cpp6
-rw-r--r--engines/mohawk/myst_state.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 5a39b933e7..432d1113b3 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -258,6 +258,9 @@ Common::Error MohawkEngine_Myst::run() {
_cursor = new MystCursorManager(this);
_rnd = new Common::RandomSource();
+ // Cursor is visible by default
+ _cursor->showCursor();
+
// Load game from launcher/command line if requested
if (ConfMan.hasKey("save_slot") && canLoadGameStateCurrently()) {
uint32 gameToLoad = ConfMan.getInt("save_slot");
@@ -286,9 +289,6 @@ Common::Error MohawkEngine_Myst::run() {
// Test Load Function...
loadHelp(10000);
- // Set the cursor
- _cursor->setCursor(_currentCursor);
-
Common::Event event;
while (!shouldQuit()) {
// Update any background videos
diff --git a/engines/mohawk/myst_state.cpp b/engines/mohawk/myst_state.cpp
index fbb8bf0ac2..bab4b8dd51 100644
--- a/engines/mohawk/myst_state.cpp
+++ b/engines/mohawk/myst_state.cpp
@@ -100,6 +100,9 @@ bool MystGameState::load(const Common::String &filename) {
syncGameState(s, size == 664);
delete loadFile;
+ // Switch us back to the intro stack, to the linking book
+ _vm->changeToStack(kIntroStack, 5, 0, 0);
+
// Set our default cursor
if (_globals.heldPage == 0 || _globals.heldPage > 13)
_vm->setMainCursor(kDefaultMystCursor);
@@ -110,9 +113,6 @@ bool MystGameState::load(const Common::String &filename) {
else // if (globals.heldPage == 13)
_vm->setMainCursor(kWhitePageCursor);
- // Switch us back to the intro stack, to the linking book
- _vm->changeToStack(kIntroStack, 5, 0, 0);
-
return true;
}