aboutsummaryrefslogtreecommitdiff
path: root/engines/hugo
diff options
context:
space:
mode:
authorMax Horn2011-02-07 22:58:22 +0000
committerMax Horn2011-02-07 22:58:22 +0000
commit41121be4d6fecbc727897471e0ceed1fd4c76bd7 (patch)
tree08ad9d64eb68bc039cc70e29092592cd8f446526 /engines/hugo
parent85aabef6fe370766fa52ba92a7cf63c558bac772 (diff)
downloadscummvm-rg350-41121be4d6fecbc727897471e0ceed1fd4c76bd7.tar.gz
scummvm-rg350-41121be4d6fecbc727897471e0ceed1fd4c76bd7.tar.bz2
scummvm-rg350-41121be4d6fecbc727897471e0ceed1fd4c76bd7.zip
GUI: Rename SaveLoadChooser::runModal to runModalWithPluginAndTarget
This avoids hiding an overloaded virtual method, which in turn can cause weird bugs (see also the next commit). svn-id: r55815
Diffstat (limited to 'engines/hugo')
-rw-r--r--engines/hugo/file.cpp4
-rw-r--r--engines/hugo/hugo.cpp4
-rw-r--r--engines/hugo/hugo.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index b17d3c9c6a..09d0272519 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -308,7 +308,7 @@ bool FileManager::saveGame(const int16 slot, const Common::String descrip) {
if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Save game:", "Save");
dialog->setSaveMode(true);
- savegameId = dialog->runModal(plugin, ConfMan.getActiveDomainName());
+ savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
savegameDescription = dialog->getResultString();
delete dialog;
} else {
@@ -422,7 +422,7 @@ bool FileManager::restoreGame(const int16 slot) {
if (slot == -1) {
GUI::SaveLoadChooser *dialog = new GUI::SaveLoadChooser("Restore game:", "Restore");
dialog->setSaveMode(false);
- savegameId = dialog->runModal(plugin, ConfMan.getActiveDomainName());
+ savegameId = dialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
delete dialog;
} else {
savegameId = slot;
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index ec6f4943db..1496e26501 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -1114,11 +1114,11 @@ void HugoEngine::endGame() {
_status.viewState = kViewExit;
}
-bool HugoEngine::canLoadGameStateCurrently() const {
+bool HugoEngine::canLoadGameStateCurrently() {
return true;
}
-bool HugoEngine::canSaveGameStateCurrently() const {
+bool HugoEngine::canSaveGameStateCurrently() {
return (_status.viewState == kViewPlay);
}
diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h
index 2cec62afe2..98723ea8ad 100644
--- a/engines/hugo/hugo.h
+++ b/engines/hugo/hugo.h
@@ -307,8 +307,8 @@ public:
return *s_Engine;
}
- bool canLoadGameStateCurrently() const;
- bool canSaveGameStateCurrently() const;
+ virtual bool canLoadGameStateCurrently();
+ virtual bool canSaveGameStateCurrently();
bool loadHugoDat();
char *useBG(const char *name);