aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorTarek Soliman2012-02-13 23:24:09 -0600
committerTarek Soliman2012-02-13 23:24:59 -0600
commit5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb (patch)
treed408ba0cdddaa2f2e8047f2327f03f2515d3c556 /engines/kyra
parentad9fdfd3904a78da10cbd3f8e0c7358b9d5d4d8b (diff)
downloadscummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.gz
scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.bz2
scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.zip
KEYMAPPER: Fix Action ctor args in most keymaps
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/eobcommon.cpp4
-rw-r--r--engines/kyra/lol.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 7f35b12123..ffee24fdee 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -345,12 +345,12 @@ void EoBCoreEngine::initKeymap() {
};
for (uint i = 0; i < ARRAYSIZE(keyActionEntries); ++i) {
- Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description, Common::kGenericActionType, Common::kActionKeyType);
+ Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description);
act->addKeyEvent(keyActionEntries[i].ks);
}
if (_flags.gameID == GI_EOB2) {
- Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"), Common::kGenericActionType, Common::kActionKeyType);
+ Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"));
act->addKeyEvent(Common::KeyState(Common::KEYCODE_6));
}
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 258f53c602..38e9d33259 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -491,7 +491,7 @@ void LoLEngine::initKeymap() {
};
for (const Common::KeyActionEntry *entry = keyActionEntries; entry->id; ++entry) {
- Common::Action *const act = new Common::Action(engineKeyMap, entry->id, entry->description, Common::kGenericActionType, Common::kActionKeyType);
+ Common::Action *const act = new Common::Action(engineKeyMap, entry->id, entry->description);
act->addKeyEvent(entry->ks);
}