diff options
| author | Stephen Kennedy | 2008-08-18 10:07:11 +0000 |
|---|---|---|
| committer | Stephen Kennedy | 2008-08-18 10:07:11 +0000 |
| commit | d92909203b56d9b3fa6c4989bdeb83dbed5b94d5 (patch) | |
| tree | 350de91c678c790dde49487804b02e1bb317f1d2 /backends/platform | |
| parent | 63c4a61032bd97b478de9cbf82510f461d08f653 (diff) | |
| download | scummvm-rg350-d92909203b56d9b3fa6c4989bdeb83dbed5b94d5.tar.gz scummvm-rg350-d92909203b56d9b3fa6c4989bdeb83dbed5b94d5.tar.bz2 scummvm-rg350-d92909203b56d9b3fa6c4989bdeb83dbed5b94d5.zip | |
- proper init of virtual keyboard now implemented (involved added EventManager::init() which is called after screen has been initialised)
- changed HardwareKey / Action id field to an array of 4 chars instead of int32. Means that the keymap key/value pairs in config file are more readable.
svn-id: r33986
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/events.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp index 93d05822df..94c762f61b 100644 --- a/backends/platform/sdl/events.cpp +++ b/backends/platform/sdl/events.cpp @@ -526,10 +526,10 @@ void OSystem_SDL::setupKeymapper() { Keymapper *mapper = getEventManager()->getKeymapper(); HardwareKeySet *keySet = new HardwareKeySet(); - keySet->addHardwareKey(new HardwareKey( 'a', KeyState(KEYCODE_a), "a" )); - keySet->addHardwareKey(new HardwareKey( 's', KeyState(KEYCODE_s), "s" )); - keySet->addHardwareKey(new HardwareKey( 'd', KeyState(KEYCODE_d), "d" )); - keySet->addHardwareKey(new HardwareKey( 'f', KeyState(KEYCODE_f), "f" )); + keySet->addHardwareKey(new HardwareKey( "a", KeyState(KEYCODE_a), "a" )); + keySet->addHardwareKey(new HardwareKey( "s", KeyState(KEYCODE_s), "s" )); + keySet->addHardwareKey(new HardwareKey( "d", KeyState(KEYCODE_d), "d" )); + keySet->addHardwareKey(new HardwareKey( "f", KeyState(KEYCODE_f), "f" )); mapper->registerHardwareKeySet(keySet); Keymap *global = new Keymap("global"); @@ -542,25 +542,25 @@ void OSystem_SDL::setupKeymapper() { evt.kbd = KeyState(kc, asc, flags); \ act->events.push_back(evt); - act = new Action(global, 'MENU', "Menu", kGenericActionCategory, kMenuAction); + act = new Action(global, "MENU", "Menu", kGenericActionCategory, kMenuAction); ADD_KEYDOWN_EVENT(KEYCODE_F5, ASCII_F5, 0) - act = new Action(global, 'SKCT', "Skip"); + act = new Action(global, "SKCT", "Skip"); ADD_KEYDOWN_EVENT(KEYCODE_ESCAPE, ASCII_ESCAPE, 0); - act = new Action(global, 'PAUS', "Pause"); + act = new Action(global, "PAUS", "Pause"); ADD_KEYDOWN_EVENT(KEYCODE_SPACE, ' ', 0) - act = new Action(global, 'SKLI', "Skip line"); + act = new Action(global, "SKLI", "Skip line"); ADD_KEYDOWN_EVENT(Common::KEYCODE_PERIOD, '.', 0); - act = new Action(specific, 'JUMP', "Jump"); + act = new Action(specific, "JUMP", "Jump"); ADD_KEYDOWN_EVENT(KEYCODE_j, 'j', 0); - act = new Action(specific, 'DUCK', "Duck"); + act = new Action(specific, "DUCK", "Duck"); ADD_KEYDOWN_EVENT(KEYCODE_d, 'd', 0); - act = new Action(specific, 'RUN_', "Run"); + act = new Action(specific, "RUN_", "Run"); ADD_KEYDOWN_EVENT(KEYCODE_r, 'r', 0); #undef ADD_KEYDOWN_EVENT |