aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2017-11-22 00:15:39 +0000
committerThierry Crozat2018-01-23 02:15:41 +0000
commit626e93e6f8cd6bdb518c5962b851b9adab09c344 (patch)
tree066d73e72ec86f39491fe70a6b13612aad704b9f
parent37706ade7860aff7ac4b61d91d35c708afaa3795 (diff)
downloadscummvm-rg350-626e93e6f8cd6bdb518c5962b851b9adab09c344.tar.gz
scummvm-rg350-626e93e6f8cd6bdb518c5962b851b9adab09c344.tar.bz2
scummvm-rg350-626e93e6f8cd6bdb518c5962b851b9adab09c344.zip
SUPERNOVA: Consume click event when hiding message
-rw-r--r--engines/supernova/state.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index d9f4e8cb25..6553596387 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -515,7 +515,11 @@ void GameManager::resetInputState() {
void GameManager::processInput() {
if (_mouseClickType == Common::EVENT_LBUTTONUP) {
- _vm->removeMessage();
+ if (_vm->_messageDisplayed) {
+ // Hide the message and consume the event
+ _vm->removeMessage();
+ return;
+ }
if (((_mouseField >= 0) && (_mouseField < 256)) ||
((_mouseField >= 512) && (_mouseField < 768))) {
@@ -544,7 +548,11 @@ void GameManager::processInput() {
_inventoryScroll += 2;
}
} else if (_mouseClickType == Common::EVENT_RBUTTONUP) {
- _vm->removeMessage();
+ if (_vm->_messageDisplayed) {
+ // Hide the message and consume the event
+ _vm->removeMessage();
+ return;
+ }
if (Object::isNullObject(_currentInputObject))
return;