aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/npcs/parrot.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-18 23:26:51 -0500
committerPaul Gilbert2016-12-18 23:26:51 -0500
commit836dbae94bb33f2ca472ca19571612a3e1bc15c0 (patch)
treee3c6def6aa37fb2596d388fbd8b2458f0b925cf2 /engines/titanic/npcs/parrot.cpp
parent23050227a65dc15a60981e4ebf4906c238387466 (diff)
downloadscummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.tar.gz
scummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.tar.bz2
scummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.zip
TITANIC: Fix Parrot message when trying to take it's perch
Diffstat (limited to 'engines/titanic/npcs/parrot.cpp')
-rw-r--r--engines/titanic/npcs/parrot.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index 37710e50bf..e9aeba11cd 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -369,7 +369,7 @@ bool CParrot::EnterViewMsg(CEnterViewMsg *msg) {
}
bool CParrot::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) {
- if (_v4) {
+ if (_v4 != 3) {
CViewItem *view = msg->_param2 ? findView() : nullptr;
startTalking(this, msg->_action, view);
}
@@ -396,10 +396,11 @@ bool CParrot::MouseDragStartMsg(CMouseDragStartMsg *msg) {
CActMsg actMsg("LoseParrot");
actMsg.execute("ParrotLobbyController");
+ return true;
}
}
- return true;
+ return false;
}
bool CParrot::LeaveViewMsg(CLeaveViewMsg *msg) {