diff options
| -rw-r--r-- | engines/lab/eventman.cpp | 25 | ||||
| -rw-r--r-- | engines/lab/eventman.h | 1 | ||||
| -rw-r--r-- | engines/lab/interface.cpp | 14 |
3 files changed, 5 insertions, 35 deletions
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp index 0a608099ea..c67250d1ad 100644 --- a/engines/lab/eventman.cpp +++ b/engines/lab/eventman.cpp @@ -208,31 +208,6 @@ void EventManager::setMousePos(Common::Point pos) { } /** - * Checks whether or not the mouse buttons have been pressed, and the last - * co-ordinates of the button press. leftbutton tells whether to check the - * left or right button. - */ -bool EventManager::mouseButton(uint16 *x, uint16 *y, bool leftButton) { - if (leftButton) { - if (_leftClick) { - *x = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x; - *y = (uint16)_mousePos.y; - _leftClick = false; - return true; - } - } else { - if (_rightClick) { - *x = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x; - *y = (uint16)_mousePos.y; - _rightClick = false; - return true; - } - } - - return false; -} - -/** * Checks whether or not a key has been pressed. */ bool EventManager::keyPress(uint16 *keyCode) { diff --git a/engines/lab/eventman.h b/engines/lab/eventman.h index 85de4b30f1..d2c5782453 100644 --- a/engines/lab/eventman.h +++ b/engines/lab/eventman.h @@ -89,7 +89,6 @@ private: private: Button *checkButtonHit(ButtonList *buttonList, Common::Point pos); - bool mouseButton(uint16 *x, uint16 *y, bool leftButton); bool keyPress(uint16 *keyCode); bool haveNextChar(); uint16 getNextChar(); diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp index b63acca7b8..fd47fc7852 100644 --- a/engines/lab/interface.cpp +++ b/engines/lab/interface.cpp @@ -151,18 +151,14 @@ IntuiMessage *EventManager::getMsg() { message._buttonId = curButton->_buttonId; message._qualifier = qualifiers; return &message; - } else if (mouseButton(&message._mouseX, &message._mouseY, true)) { - // Left Button - message._qualifier = IEQUALIFIER_LEFTBUTTON | qualifiers; - message._msgClass = MOUSEBUTTONS; - return &message; - } else if (mouseButton(&message._mouseX, &message._mouseY, false)) { - // Right Button - message._qualifier = IEQUALIFIER_RIGHTBUTTON | qualifiers; + } else if (_leftClick || _rightClick) { + message._qualifier = (_leftClick) ? (IEQUALIFIER_LEFTBUTTON | qualifiers) : (IEQUALIFIER_RIGHTBUTTON | qualifiers); message._msgClass = MOUSEBUTTONS; + message._mouseX = (!_vm->_isHiRes) ? (uint16)_mousePos.x / 2 : (uint16)_mousePos.x; + message._mouseY = (uint16)_mousePos.y; + _leftClick = _rightClick = false; return &message; } else if (keyPress(&message._code)) { - // Keyboard key curButton = checkNumButtonHit(_screenButtonList, message._code); if (curButton) { |