diff options
author | Max Horn | 2006-04-15 17:39:14 +0000 |
---|---|---|
committer | Max Horn | 2006-04-15 17:39:14 +0000 |
commit | ad45318328e23b76e346414c62ef4c22d8ebe059 (patch) | |
tree | 9956847a38797471f73fd26ec3203dbbae6efd78 /backends/symbian | |
parent | dc5f513bcf7b6177a4d8f7e10fb4ed4dd55d7588 (diff) | |
download | scummvm-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 'backends/symbian')
-rw-r--r-- | backends/symbian/src/SymbianActions.cpp | 23 | ||||
-rw-r--r-- | backends/symbian/src/SymbianOS.cpp | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/backends/symbian/src/SymbianActions.cpp b/backends/symbian/src/SymbianActions.cpp index 42679b889f..4844bc27b2 100644 --- a/backends/symbian/src/SymbianActions.cpp +++ b/backends/symbian/src/SymbianActions.cpp @@ -62,8 +62,8 @@ const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0x11a, 0x11b, SDLK_MENU, #endif // creator function according to Factory Pattern -void SymbianActions::init(const Common::String &gameid) { - _instance = new SymbianActions(gameid); +void SymbianActions::init() { + _instance = new SymbianActions(); } @@ -83,8 +83,8 @@ int SymbianActions::version() { return ACTION_VERSION; } -SymbianActions::SymbianActions(const Common::String &gameid) : - Actions(gameid) { +SymbianActions::SymbianActions() + : Actions() { int i; for (i = 0; i < ACTION_LAST; i++) { @@ -121,17 +121,18 @@ void SymbianActions::initInstanceMain(OSystem *mainSystem) { } void SymbianActions::initInstanceGame() { - bool is_simon = (strncmp(_gameid.c_str(), "simon", 5) == 0); - bool is_sky = (_gameid == "sky"); - bool is_queen = (_gameid == "queen"); - bool is_gob = (strncmp(_gameid.c_str(), "gob", 3) == 0); - bool is_ite = ((strncmp(_gameid.c_str(), "ite", 3) == 0) || - (strncmp(_gameid.c_str(), "ihnm", 4) == 0)); + String gameid(ConfMan.get("gameid")); + bool is_simon = (strncmp(gameid.c_str(), "simon", 5) == 0); + bool is_sky = (gameid == "sky"); + bool is_queen = (gameid == "queen"); + bool is_gob = (strncmp(gameid.c_str(), "gob", 3) == 0); + bool is_ite = ((strncmp(gameid.c_str(), "ite", 3) == 0) || + (strncmp(gameid.c_str(), "ihnm", 4) == 0)); Actions::initInstanceGame(); // See if a right click mapping could be needed - if (is_sky || _gameid == "samnmax" || is_gob) + if (is_sky || gameid == "samnmax" || is_gob) _right_click_needed = true; // Initialize keys for different actions diff --git a/backends/symbian/src/SymbianOS.cpp b/backends/symbian/src/SymbianOS.cpp index d7539fcfe9..13dac270fd 100644 --- a/backends/symbian/src/SymbianOS.cpp +++ b/backends/symbian/src/SymbianOS.cpp @@ -377,7 +377,7 @@ void OSystem_SDL_Symbian::setWindowCaption(const char *caption) { } void OSystem_SDL_Symbian::check_mappings() { - if (!GUI::Actions::Instance()->_gameid.size() || GUI::Actions::Instance()->initialized()) + if (ConfMan.get("gameid").empty() || GUI::Actions::Instance()->initialized()) return; GUI::Actions::Instance()->initInstanceGame(); |