aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-12 19:49:09 -0500
committerPaul Gilbert2016-11-12 19:49:09 -0500
commita02adba8423c295b32b465a22f90229253c50cdf (patch)
treeecbcdfcb28ae1a1aa8227f7392aaef4c6fbb66c3 /engines/titanic/game
parent82211302c04f8320953d568b912052e3c6d3f11c (diff)
downloadscummvm-rg350-a02adba8423c295b32b465a22f90229253c50cdf.tar.gz
scummvm-rg350-a02adba8423c295b32b465a22f90229253c50cdf.tar.bz2
scummvm-rg350-a02adba8423c295b32b465a22f90229253c50cdf.zip
TITANIC: Renamings of transitioning counter methods
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/bridge_view.cpp2
-rw-r--r--engines/titanic/game/captains_wheel.cpp4
-rw-r--r--engines/titanic/game/fan_control.cpp4
-rw-r--r--engines/titanic/game/nav_helmet.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/bridge_view.cpp b/engines/titanic/game/bridge_view.cpp
index 466480a64c..5b2b8809d9 100644
--- a/engines/titanic/game/bridge_view.cpp
+++ b/engines/titanic/game/bridge_view.cpp
@@ -90,7 +90,7 @@ bool CBridgeView::MovieEndMsg(CMovieEndMsg *msg) {
case 0:
case 1:
setVisible(false);
- dec54();
+ decTransitions();
break;
case 2: {
diff --git a/engines/titanic/game/captains_wheel.cpp b/engines/titanic/game/captains_wheel.cpp
index 79908b561d..72d3cf70d9 100644
--- a/engines/titanic/game/captains_wheel.cpp
+++ b/engines/titanic/game/captains_wheel.cpp
@@ -99,7 +99,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) {
}
} else if (msg->_action == "Go") {
if (!_fieldE0) {
- inc54();
+ incTransitions();
_fieldE0 = false;
_fieldE4 = 1;
@@ -109,7 +109,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) {
}
} else if (msg->_action == "Cruise") {
if (_fieldE0) {
- inc54();
+ incTransitions();
_fieldE0 = false;
_fieldE4 = 2;
diff --git a/engines/titanic/game/fan_control.cpp b/engines/titanic/game/fan_control.cpp
index 288fdb639f..b3c3b2e816 100644
--- a/engines/titanic/game/fan_control.cpp
+++ b/engines/titanic/game/fan_control.cpp
@@ -65,7 +65,7 @@ bool CFanControl::ActMsg(CActMsg *msg) {
_enabled = false;
else if (msg->_action == "StarlingsDead") {
_fieldC4 = 0;
- dec54();
+ decTransitions();
_fieldCC = 0;
}
@@ -116,7 +116,7 @@ bool CFanControl::StatusChangeMsg(CStatusChangeMsg *msg) {
break;
case 2:
if (_fieldC4) {
- inc54();
+ incTransitions();
_fieldCC = 1;
playMovie(12, 18, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE);
} else {
diff --git a/engines/titanic/game/nav_helmet.cpp b/engines/titanic/game/nav_helmet.cpp
index 3e2a38486d..874683ad1b 100644
--- a/engines/titanic/game/nav_helmet.cpp
+++ b/engines/titanic/game/nav_helmet.cpp
@@ -91,9 +91,9 @@ bool CNavHelmet::PETHelmetOnOffMsg(CPETHelmetOnOffMsg *msg) {
pet->setArea(PET_REMOTE);
}
- dec54();
+ decTransitions();
} else {
- inc54();
+ incTransitions();
_flag = true;
setVisible(true);
playMovie(0, 60, MOVIE_NOTIFY_OBJECT);