aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/game/parrot/parrot_perch_holder.cpp2
-rw-r--r--engines/titanic/npcs/parrot.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp
index b1a7dabfbf..205995cf1c 100644
--- a/engines/titanic/game/parrot/parrot_perch_holder.cpp
+++ b/engines/titanic/game/parrot/parrot_perch_holder.cpp
@@ -45,7 +45,7 @@ void CParrotPerchHolder::load(SimpleFile *file) {
}
bool CParrotPerchHolder::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
- if (CParrot::_v1) {
+ if (!CParrot::_v1) {
if (CCage::_open) {
petDisplayMessage(CANNOT_TAKE_CAGE_LOCKED);
} else if (!CParrot::_v4) {
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) {