ALL: synced with scummvm

This commit is contained in:
Pawel Kolodziejski 2012-03-25 11:41:48 +02:00
parent 5e86a8d5a8
commit 8e2ab87455
90 changed files with 2414 additions and 1422 deletions

View file

@ -265,10 +265,10 @@ static void setupKeymapper(OSystem &system) {
Keymapper *mapper = system.getEventManager()->getKeymapper();
HardwareKeySet *keySet = system.getHardwareKeySet();
HardwareInputSet *inputSet = system.getHardwareInputSet();
// Query backend for hardware keys and register them
mapper->registerHardwareKeySet(keySet);
mapper->registerHardwareInputSet(inputSet);
// Now create the global keymap
Keymap *primaryGlobalKeymap = new Keymap(kGlobalKeymapName);