diff options
| author | Paul Gilbert | 2016-12-18 23:26:51 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-18 23:26:51 -0500 |
| commit | 836dbae94bb33f2ca472ca19571612a3e1bc15c0 (patch) | |
| tree | e3c6def6aa37fb2596d388fbd8b2458f0b925cf2 | |
| parent | 23050227a65dc15a60981e4ebf4906c238387466 (diff) | |
| download | scummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.tar.gz scummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.tar.bz2 scummvm-rg350-836dbae94bb33f2ca472ca19571612a3e1bc15c0.zip | |
TITANIC: Fix Parrot message when trying to take it's perch
| -rw-r--r-- | engines/titanic/game/parrot/parrot_perch_holder.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/parrot.cpp | 5 |
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) { |