diff options
Diffstat (limited to 'engines/titanic/game')
| -rw-r--r-- | engines/titanic/game/cage.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/game/parrot/parrot_perch_holder.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/game/cage.cpp b/engines/titanic/game/cage.cpp index 11f5837e4c..f51e935231 100644 --- a/engines/titanic/game/cage.cpp +++ b/engines/titanic/game/cage.cpp @@ -53,7 +53,7 @@ void CCage::load(SimpleFile *file) { } bool CCage::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (CParrot::_state != PARROT_IN_CAGE && !CParrot::_v5) { + if (CParrot::_state != PARROT_IN_CAGE && !CParrot::_coreReplaced) { CActMsg actMsg(_open ? "Open" : "Shut"); actMsg.execute(this); } @@ -103,7 +103,7 @@ bool CCage::PreEnterViewMsg(CPreEnterViewMsg *msg) { } bool CCage::MouseMoveMsg(CMouseMoveMsg *msg) { - _cursorId = CParrot::_state != PARROT_IN_CAGE && !CParrot::_v5 ? CURSOR_ACTIVATE : CURSOR_ARROW; + _cursorId = CParrot::_state != PARROT_IN_CAGE && !CParrot::_coreReplaced ? CURSOR_ACTIVATE : CURSOR_ARROW; return true; } diff --git a/engines/titanic/game/parrot/parrot_perch_holder.cpp b/engines/titanic/game/parrot/parrot_perch_holder.cpp index 557f70437a..fb7564ea17 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::_eatingChicken) { if (CCage::_open) { petDisplayMessage(CANNOT_TAKE_CAGE_LOCKED); } else if (CParrot::_state == PARROT_IN_CAGE) { |