aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorMax Horn2006-04-15 17:39:14 +0000
committerMax Horn2006-04-15 17:39:14 +0000
commitad45318328e23b76e346414c62ef4c22d8ebe059 (patch)
tree9956847a38797471f73fd26ec3203dbbae6efd78 /base/main.cpp
parentdc5f513bcf7b6177a4d8f7e10fb4ed4dd55d7588 (diff)
downloadscummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.tar.gz
scummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.tar.bz2
scummvm-rg350-ad45318328e23b76e346414c62ef4c22d8ebe059.zip
Removed GameDetector::_gameid in favor of using a config manager entry
svn-id: r21915
Diffstat (limited to 'base/main.cpp')
-rw-r--r--base/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/base/main.cpp b/base/main.cpp
index be4502875b..1b01bdcbd5 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -181,7 +181,7 @@ static int runGame(const Plugin *plugin, GameDetector &detector, OSystem &system
// Set the window caption to the game name
Common::String caption(ConfMan.get("description", detector._targetName));
- Common::String desc = GameDetector::findGame(detector._gameid).description;
+ Common::String desc = GameDetector::findGame(ConfMan.get("gameid")).description;
if (caption.empty() && !desc.empty())
caption = desc;
if (caption.empty())
@@ -292,7 +292,7 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
#if defined(__SYMBIAN32__) || defined(_WIN32_WCE)
// init keymap support here: we wanna move this somewhere else?
- GUI::Actions::init(detector._gameid);
+ GUI::Actions::init(ConfMan.get("gameid"));
#endif
#ifdef PALMOS_68K