aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/cage.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-26 23:22:10 -0500
committerPaul Gilbert2016-12-26 23:22:10 -0500
commit3603ed73f0e95c286362f089ccffad42f2f40182 (patch)
tree756d8399e110ea75a88cec4c8554de67e0641d33 /engines/titanic/game/cage.cpp
parenta5f01bbfb8ad72a983a08fb18ae940931702ccab (diff)
downloadscummvm-rg350-3603ed73f0e95c286362f089ccffad42f2f40182.tar.gz
scummvm-rg350-3603ed73f0e95c286362f089ccffad42f2f40182.tar.bz2
scummvm-rg350-3603ed73f0e95c286362f089ccffad42f2f40182.zip
TITANIC: Change CParrot::_v4 to _state
Diffstat (limited to 'engines/titanic/game/cage.cpp')
-rw-r--r--engines/titanic/game/cage.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/game/cage.cpp b/engines/titanic/game/cage.cpp
index bbac384cea..11f5837e4c 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::_v4 && !CParrot::_v5) {
+ if (CParrot::_state != PARROT_IN_CAGE && !CParrot::_v5) {
CActMsg actMsg(_open ? "Open" : "Shut");
actMsg.execute(this);
}
@@ -88,7 +88,7 @@ bool CCage::MovieEndMsg(CMovieEndMsg *msg) {
_open = clipExistsByEnd("Shut", msg->_endFrame);
CStatusChangeMsg statusMsg;
- statusMsg._newStatus = _open ? 1 : (CParrot::_v4 == 0 ? 1 : 0);
+ statusMsg._newStatus = _open ? 1 : (CParrot::_state == PARROT_IN_CAGE ? 1 : 0);
statusMsg.execute("PerchCoreHolder");
return true;
@@ -96,14 +96,14 @@ bool CCage::MovieEndMsg(CMovieEndMsg *msg) {
bool CCage::PreEnterViewMsg(CPreEnterViewMsg *msg) {
loadSurface();
- _open = CParrot::_v4 != 0;
+ _open = CParrot::_state != PARROT_IN_CAGE;
loadFrame(_open ? 8 : 0);
return true;
}
bool CCage::MouseMoveMsg(CMouseMoveMsg *msg) {
- _cursorId = CParrot::_v4 && !CParrot::_v5 ? CURSOR_ACTIVATE : CURSOR_ARROW;
+ _cursorId = CParrot::_state != PARROT_IN_CAGE && !CParrot::_v5 ? CURSOR_ACTIVATE : CURSOR_ARROW;
return true;
}