thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: More cleanup of the keyboard handling code

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-24 18:25:16 +02:00
parent 9c749c7d2e
commit b2fad340b5
3 changed files with 19 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/lab/interface.cpp
View file

@ -117,8 +117,7 @@ IntuiMessage *EventManager::getMsg() {
static IntuiMessage message;
updateMouse();
Common::KeyCode curKey = keyPress();
processInput();
if (_lastButtonHit) {
updateMouse();
@ -135,8 +134,10 @@ IntuiMessage *EventManager::getMsg() {
message._mouse.x /= 2;
_leftClick = _rightClick = false;
return &message;
} else if (curKey != Common::KEYCODE_INVALID) {
message._code = curKey;
} else if (_keyPressed.keycode != Common::KEYCODE_INVALID) {
message._code = _keyPressed.keycode;
_keyPressed.keycode = Common::KEYCODE_INVALID;
Button *curButton = checkNumButtonHit(_screenButtonList, message._code);
if (curButton) {