aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/riven.cpp
diff options
context:
space:
mode:
authorBastien Bouclet2016-08-06 22:16:45 +0200
committerEugene Sandulenko2017-07-03 08:50:10 +0200
commit9b2c90c0b3323aac8d3fd49c20fa1121946996e2 (patch)
treeae178c8130f1fba5ca1094b3643b4f02c2b6c017 /engines/mohawk/riven.cpp
parentc1331e124f61b22446de5ff81171f2cf3bac59ba (diff)
downloadscummvm-rg350-9b2c90c0b3323aac8d3fd49c20fa1121946996e2.tar.gz
scummvm-rg350-9b2c90c0b3323aac8d3fd49c20fa1121946996e2.tar.bz2
scummvm-rg350-9b2c90c0b3323aac8d3fd49c20fa1121946996e2.zip
MOHAWK: The ignoreNextMouseUp workaround is not necessary anymore
We now check the mouse up event happens on the same hotspot as the mouse down event.
Diffstat (limited to 'engines/mohawk/riven.cpp')
-rw-r--r--engines/mohawk/riven.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index f31f12de0e..9ed7b22ac1 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -56,7 +56,6 @@ MohawkEngine_Riven::MohawkEngine_Riven(OSystem *syst, const MohawkGameDescriptio
_gameOver = false;
_activatedPLST = false;
_activatedSLST = false;
- _ignoreNextMouseUp = false;
_extrasFile = nullptr;
_curStack = kStackUnknown;
_gfx = nullptr;
@@ -230,13 +229,8 @@ void MohawkEngine_Riven::handleEvents() {
_card->onMouseDown(_eventMan->getMousePos());
break;
case Common::EVENT_LBUTTONUP:
- // See RivenScript::switchCard() for more information on why we sometimes
- // disable the next up event.
- if (!_ignoreNextMouseUp) {
- _card->onMouseUp(_eventMan->getMousePos());
- checkInventoryClick();
- }
- _ignoreNextMouseUp = false;
+ _card->onMouseUp(_eventMan->getMousePos());
+ checkInventoryClick();
break;
case Common::EVENT_KEYDOWN:
switch (event.kbd.keycode) {