[Scummvm-cvs-logs] SF.net SVN: scummvm:[55816] scummvm/trunk/engines
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 7 23:58:43 CET 2011
Revision: 55816
http://scummvm.svn.sourceforge.net/scummvm/?rev=55816&view=rev
Author: fingolfin
Date: 2011-02-07 22:58:42 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
MOHAWK: Fix MohawkEngine_Myst::runLoadDialog
This incorrectly invoked (indirectly) the runModal() method of a
SaveLoadChooser, but for that one should use runModalWithPluginAndTarget
instead.
Modified Paths:
--------------
scummvm/trunk/engines/dialogs.cpp
scummvm/trunk/engines/mohawk/myst.cpp
Modified: scummvm/trunk/engines/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/dialogs.cpp 2011-02-07 22:58:22 UTC (rev 55815)
+++ scummvm/trunk/engines/dialogs.cpp 2011-02-07 22:58:42 UTC (rev 55816)
@@ -219,7 +219,7 @@
}
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::load() {
- Common::String gameId = ConfMan.get("gameid");
+ const Common::String gameId = ConfMan.get("gameid");
const EnginePlugin *plugin = 0;
EngineMan.findGame(gameId, &plugin);
Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp 2011-02-07 22:58:22 UTC (rev 55815)
+++ scummvm/trunk/engines/mohawk/myst.cpp 2011-02-07 22:58:42 UTC (rev 55816)
@@ -1147,7 +1147,17 @@
}
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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list