aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/cage.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-01-18 20:54:05 -0500
committerPaul Gilbert2017-01-18 20:54:05 -0500
commit12ebe10d0178ecbdec1cc58e165926cb58cb13ff (patch)
tree5c339ba572f89eb0814070d4e8f33f607f0ff5ee /engines/titanic/game/cage.cpp
parenta4997f62cc51575b914e15a90923058cb5c58bac (diff)
downloadscummvm-rg350-12ebe10d0178ecbdec1cc58e165926cb58cb13ff.tar.gz
scummvm-rg350-12ebe10d0178ecbdec1cc58e165926cb58cb13ff.tar.bz2
scummvm-rg350-12ebe10d0178ecbdec1cc58e165926cb58cb13ff.zip
TITANIC: Renaming of CParrot statics, miscellaneous fixes
Diffstat (limited to 'engines/titanic/game/cage.cpp')
-rw-r--r--engines/titanic/game/cage.cpp4
1 files changed, 2 insertions, 2 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;
}