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

LAB: Reorganize the code a bit in getMsg()

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-24 18:30:41 +02:00
parent b2fad340b5
commit c0f3131fbe
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/lab/interface.cpp
View file

@ -135,18 +135,20 @@ IntuiMessage *EventManager::getMsg() {
_leftClick = _rightClick = false;
return &message;
} else if (_keyPressed.keycode != Common::KEYCODE_INVALID) {
message._code = _keyPressed.keycode;
_keyPressed.keycode = Common::KEYCODE_INVALID;
Button *curButton = checkNumButtonHit(_screenButtonList, message._code);
Button *curButton = checkNumButtonHit(_screenButtonList, _keyPressed.keycode);
if (curButton) {
message._msgClass = kMessageButtonUp;
message._code = curButton->_buttonId;
} else
} else {
message._msgClass = kMessageRawKey;
message._code = _keyPressed.keycode;
}
message._qualifier = _keyPressed.flags;
_keyPressed.keycode = Common::KEYCODE_INVALID;
return &message;
} else
return nullptr;