aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2011-02-07 22:58:42 +0000
committerMax Horn2011-02-07 22:58:42 +0000
commit7bac92388f9d9eb14f2032a20f63a67e3bb9914f (patch)
tree5c5da08ade9678aa02606d57ff5699199fe5e5b3 /engines
parent41121be4d6fecbc727897471e0ceed1fd4c76bd7 (diff)
downloadscummvm-rg350-7bac92388f9d9eb14f2032a20f63a67e3bb9914f.tar.gz
scummvm-rg350-7bac92388f9d9eb14f2032a20f63a67e3bb9914f.tar.bz2
scummvm-rg350-7bac92388f9d9eb14f2032a20f63a67e3bb9914f.zip
MOHAWK: Fix MohawkEngine_Myst::runLoadDialog
This incorrectly invoked (indirectly) the runModal() method of a SaveLoadChooser, but for that one should use runModalWithPluginAndTarget instead. svn-id: r55816
Diffstat (limited to 'engines')
-rw-r--r--engines/dialogs.cpp4
-rw-r--r--engines/mohawk/myst.cpp12
2 files changed, 13 insertions, 3 deletions
diff --git a/engines/dialogs.cpp b/engines/dialogs.cpp
index 7c75837551..18c184e568 100644
--- a/engines/dialogs.cpp
+++ b/engines/dialogs.cpp
@@ -219,7 +219,7 @@ void MainMenuDialog::reflowLayout() {
}
void MainMenuDialog::save() {
- Common::String gameId = ConfMan.get("gameid");
+ const Common::String gameId = ConfMan.get("gameid");
const EnginePlugin *plugin = 0;
EngineMan.findGame(gameId, &plugin);
@@ -242,7 +242,7 @@ void MainMenuDialog::save() {
}
void MainMenuDialog::load() {
- Common::String gameId = ConfMan.get("gameid");
+ const Common::String gameId = ConfMan.get("gameid");
const EnginePlugin *plugin = 0;
EngineMan.findGame(gameId, &plugin);
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index fe2ffd5879..91fa779eb9 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -1147,7 +1147,17 @@ void MohawkEngine_Myst::loadResources() {
}
void MohawkEngine_Myst::runLoadDialog() {
- runDialog(*_loadDialog);
+ const Common::String gameId = ConfMan.get("gameid");
+
+ const EnginePlugin *plugin = 0;
+ EngineMan.findGame(gameId, &plugin);
+
+ pauseEngine(true);
+ int slot = _loadDialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
+ if (slot >= 0) {
+ // TODO
+ }
+ pauseEngine(false);
}
Common::Error MohawkEngine_Myst::loadGameState(int slot) {