aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-05-01 15:03:03 -0400
committerPaul Gilbert2016-07-10 16:38:01 -0400
commit6c2949ba2388ef949ee4148fcf0ee424a90fe4f0 (patch)
tree1007ddf7f1d7da6432aa24ab53741450228ee304
parentf01b8e9c45e3349c84346f270c17610b0e5350b0 (diff)
downloadscummvm-rg350-6c2949ba2388ef949ee4148fcf0ee424a90fe4f0.tar.gz
scummvm-rg350-6c2949ba2388ef949ee4148fcf0ee424a90fe4f0.tar.bz2
scummvm-rg350-6c2949ba2388ef949ee4148fcf0ee424a90fe4f0.zip
TITANIC: Fix PET Conversations scroll buttons
-rw-r--r--engines/titanic/pet_control/pet_conversations.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp
index eb2f9716b6..810434074a 100644
--- a/engines/titanic/pet_control/pet_conversations.cpp
+++ b/engines/titanic/pet_control/pet_conversations.cpp
@@ -143,9 +143,15 @@ bool CPetConversations::isValid(CPetControl *petControl) {
}
bool CPetConversations::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
+ if (_scrollDown.MouseButtonDownMsg(msg->_mousePos)) {
+ scrollDown();
+ return true;
+ } else if (_scrollUp.MouseButtonDownMsg(msg->_mousePos)) {
+ scrollUp();
+ return true;
+ }
+
return
- _scrollUp.MouseButtonDownMsg(msg->_mousePos) ||
- _scrollDown.MouseButtonDownMsg(msg->_mousePos) ||
_doorBot.MouseButtonDownMsg(msg->_mousePos) ||
_bellBot.MouseButtonDownMsg(msg->_mousePos);
}