diff options
Diffstat (limited to 'engines/sword2/sword2.cpp')
| -rw-r--r-- | engines/sword2/sword2.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp index be240e5956..6bbd58ff3c 100644 --- a/engines/sword2/sword2.cpp +++ b/engines/sword2/sword2.cpp @@ -381,17 +381,17 @@ int Sword2Engine::go() { KeyboardEvent *ke = keyboardEvent(); if (ke) { - if ((ke->modifiers == Common::KBD_CTRL && ke->keycode == 'd') || ke->ascii == '#' || ke->ascii == '~') { + if ((ke->kbd.flags == Common::KBD_CTRL && ke->kbd.keycode == Common::KEYCODE_d) || ke->kbd.ascii == '#' || ke->kbd.ascii == '~') { _debugger->attach(); - } else if (ke->modifiers == 0 || ke->modifiers == Common::KBD_SHIFT) { - switch (ke->keycode) { - case 'p': + } else if (ke->kbd.flags == 0 || ke->kbd.flags == Common::KBD_SHIFT) { + switch (ke->kbd.keycode) { + case Common::KEYCODE_p: if (_gamePaused) unpauseGame(); else pauseGame(); break; - case 'c': + case Common::KEYCODE_c: if (!_logic->readVar(DEMO) && !_mouse->isChoosing()) { ScreenInfo *screenInfo = _screen->getScreenInfo(); _logic->fnPlayCredits(NULL); @@ -399,13 +399,13 @@ int Sword2Engine::go() { } break; #ifdef SWORD2_DEBUG - case ' ': + case Common::KEYCODE_SPACE: if (_gamePaused) { _stepOneCycle = true; unpauseGame(); } break; - case 's': + case Common::KEYCODE_s: _renderSkip = !_renderSkip; break; #endif @@ -553,9 +553,7 @@ void Sword2Engine::parseInputEvents() { } if (!(_inputEventFilter & RD_KEYDOWN)) { _keyboardEvent.pending = true; - _keyboardEvent.ascii = event.kbd.ascii; - _keyboardEvent.keycode = event.kbd.keycode; - _keyboardEvent.modifiers = event.kbd.flags; + _keyboardEvent.kbd = event.kbd; } break; case Common::EVENT_LBUTTONDOWN: |