diff options
| author | Filippos Karapetis | 2015-12-13 15:37:39 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-12-23 21:34:02 +0100 |
| commit | 577b60d7853156851894430ad8032ed14b353e33 (patch) | |
| tree | dd4c750654cbaa4f7f0a61eb47283d0b72d0d785 /engines/lab/interface.cpp | |
| parent | 7c1401264ca0da173dfe4de09ca4884d63feeb55 (diff) | |
| download | scummvm-rg350-577b60d7853156851894430ad8032ed14b353e33.tar.gz scummvm-rg350-577b60d7853156851894430ad8032ed14b353e33.tar.bz2 scummvm-rg350-577b60d7853156851894430ad8032ed14b353e33.zip | |
LAB: Move getMsg to the event manager
Diffstat (limited to 'engines/lab/interface.cpp')
| -rw-r--r-- | engines/lab/interface.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp index 08a53e2c63..cd062a8ea3 100644 --- a/engines/lab/interface.cpp +++ b/engines/lab/interface.cpp @@ -135,34 +135,34 @@ Gadget *EventManager::checkNumGadgetHit(GadgetList *gadgetList, uint16 key) { return nullptr; } -IntuiMessage *LabEngine::getMsg() { +IntuiMessage *EventManager::getMsg() { static IntuiMessage message; - _event->updateMouse(); + updateMouse(); - int qualifiers = _event->_keyPressed.flags; - Gadget *curgad = _event->mouseGadget(); + int qualifiers = _keyPressed.flags; + Gadget *curgad = mouseGadget(); if (curgad) { - _event->updateMouse(); + updateMouse(); message._msgClass = GADGETUP; message._code = curgad->_gadgetID; message._gadgetID = curgad->_gadgetID; message._qualifier = qualifiers; return &message; - } else if (_event->mouseButton(&message._mouseX, &message._mouseY, true)) { + } else if (mouseButton(&message._mouseX, &message._mouseY, true)) { // Left Button message._qualifier = IEQUALIFIER_LEFTBUTTON | qualifiers; message._msgClass = MOUSEBUTTONS; return &message; - } else if (_event->mouseButton(&message._mouseX, &message._mouseY, false)) { + } else if (mouseButton(&message._mouseX, &message._mouseY, false)) { // Right Button message._qualifier = IEQUALIFIER_RIGHTBUTTON | qualifiers; message._msgClass = MOUSEBUTTONS; return &message; - } else if (_event->keyPress(&message._code)) { + } else if (keyPress(&message._code)) { // Keyboard key - curgad = _event->checkNumGadgetHit(_event->_screenGadgetList, message._code); + curgad = checkNumGadgetHit(_screenGadgetList, message._code); if (curgad) { message._msgClass = GADGETUP; |