aboutsummaryrefslogtreecommitdiff
path: root/engines/engine.cpp
diff options
context:
space:
mode:
authorMax Horn2008-09-30 12:27:38 +0000
committerMax Horn2008-09-30 12:27:38 +0000
commit9b160804ab8878b55efb032fb62ee359ab97f848 (patch)
treeaa0ac6d0aec815de5f2368acc00971948cf3fa0b /engines/engine.cpp
parent87917e06d94e36c483011deaf1eb4a5dba6eeb97 (diff)
downloadscummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.gz
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.tar.bz2
scummvm-rg350-9b160804ab8878b55efb032fb62ee359ab97f848.zip
Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
Diffstat (limited to 'engines/engine.cpp')
-rw-r--r--engines/engine.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp
index 1d3368b10d..4febccec05 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -168,7 +168,7 @@ void Engine::checkCD() {
GUI::MessageDialog dialog(
"You appear to be playing this game directly\n"
"from the CD. This is known to cause problems,\n"
- "and it's therefore recommended that you copy\n"
+ "and it is therefore recommended that you copy\n"
"the data files to your hard disk instead.\n"
"See the README file for details.", "OK");
dialog.runModal();
@@ -224,11 +224,8 @@ void Engine::mainMenuDialog() {
}
int Engine::runDialog(Dialog &dialog) {
-
pauseEngine(true);
-
int result = dialog.runModal();
-
pauseEngine(false);
return result;
@@ -254,6 +251,7 @@ void Engine::quitGame() {
}
bool Engine::hasFeature(int f) {
+ // TODO: In each engine, keep a ref to the corresponding MetaEngine?
const EnginePlugin *plugin = 0;
Common::String gameid = ConfMan.get("gameid");
gameid.toLowercase();