diff options
| author | Tarek Soliman | 2011-12-30 11:50:15 -0600 |
|---|---|---|
| committer | Tarek Soliman | 2011-12-30 12:36:11 -0600 |
| commit | 40b68b41c7a507dad5a1d38813bfa7f89e7c6551 (patch) | |
| tree | b6eed041452dc5fb70db1cfaf2d3d90e4030ab74 /engines/kyra | |
| parent | b3f265696ffbf7d91e8ee303458ae78571cb6b68 (diff) | |
| download | scummvm-rg350-40b68b41c7a507dad5a1d38813bfa7f89e7c6551.tar.gz scummvm-rg350-40b68b41c7a507dad5a1d38813bfa7f89e7c6551.tar.bz2 scummvm-rg350-40b68b41c7a507dad5a1d38813bfa7f89e7c6551.zip | |
KEYMAPPER: Make engine keymap init and cleanup more generic
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/lol.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 62143e5f72..db71b80611 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -212,10 +212,6 @@ LoLEngine::~LoLEngine() { setupPrologueData(false); releaseTempData(); -#ifdef ENABLE_KEYMAPPER - _eventMan->getKeymapper()->cleanupGameKeymaps(); -#endif - delete[] _landsFile; delete[] _levelLangFile; @@ -461,7 +457,9 @@ Common::Error LoLEngine::init() { _spellProcs.push_back(new SpellProc(this, 0)); _spellProcs.push_back(new SpellProc(this, &LoLEngine::castGuardian)); - initKeymap(); +#ifdef ENABLE_KEYMAPPER + _eventMan->getKeymapper()->pushKeymap(kKeymapName, true); +#endif return Common::kNoError; } @@ -503,8 +501,6 @@ void LoLEngine::initKeymap() { mapper->addGameKeymap(engineKeyMap); - mapper->pushKeymap(kKeymapName, true); - #endif } |