diff options
-rw-r--r-- | engines/lab/eventman.cpp | 7 | ||||
-rw-r--r-- | engines/lab/eventman.h | 1 | ||||
-rw-r--r-- | engines/lab/interface.cpp | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp index 2537412af0..0a608099ea 100644 --- a/engines/lab/eventman.cpp +++ b/engines/lab/eventman.cpp @@ -232,13 +232,6 @@ bool EventManager::mouseButton(uint16 *x, uint16 *y, bool leftButton) { return false; } -Button *EventManager::mouseButton() { - Button *temp = _lastButtonHit; - - _lastButtonHit = nullptr; - return temp; -} - /** * Checks whether or not a key has been pressed. */ diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h index 354d4ee4f4..85de4b30f1 100644 --- a/engines/lab/eventman.h +++ b/engines/lab/eventman.h @@ -90,7 +90,6 @@ private: private: Button *checkButtonHit(ButtonList *buttonList, Common::Point pos); bool mouseButton(uint16 *x, uint16 *y, bool leftButton); - Button *mouseButton(); bool keyPress(uint16 *keyCode); bool haveNextChar(); uint16 getNextChar(); diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp index fea9f5a764..b63acca7b8 100644 --- a/engines/lab/interface.cpp +++ b/engines/lab/interface.cpp @@ -141,7 +141,8 @@ IntuiMessage *EventManager::getMsg() { updateMouse(); int qualifiers = _keyPressed.flags; - Button *curButton = mouseButton(); + Button *curButton = _lastButtonHit; + _lastButtonHit = nullptr; if (curButton) { updateMouse(); |