aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-17 00:19:13 +0200
committerWillem Jan Palenstijn2015-12-23 21:34:07 +0100
commit09539d76ac702577213ed9a2678f847d6683bba8 (patch)
treead1d7972bba6fabe73ee4a99c76d64ebe13adb4d /engines
parent5aef1367e26ce056d8e54a3fc2b3734090660f56 (diff)
downloadscummvm-rg350-09539d76ac702577213ed9a2678f847d6683bba8.tar.gz
scummvm-rg350-09539d76ac702577213ed9a2678f847d6683bba8.tar.bz2
scummvm-rg350-09539d76ac702577213ed9a2678f847d6683bba8.zip
LAB: Remove superfluous function
Diffstat (limited to 'engines')
-rw-r--r--engines/lab/eventman.cpp7
-rw-r--r--engines/lab/eventman.h1
-rw-r--r--engines/lab/interface.cpp3
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();