aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-20 23:32:27 -0500
committerPaul Gilbert2017-02-20 23:32:27 -0500
commit89efab8bddd76786c3b1ca82556ee9e5486d0cf9 (patch)
treede0a339bf745818436a1ca5885ab70327266c5c5 /engines/titanic/game
parent75571a80fd78065a7765903f457769fa9fdd4748 (diff)
downloadscummvm-rg350-89efab8bddd76786c3b1ca82556ee9e5486d0cf9.tar.gz
scummvm-rg350-89efab8bddd76786c3b1ca82556ee9e5486d0cf9.tar.bz2
scummvm-rg350-89efab8bddd76786c3b1ca82556ee9e5486d0cf9.zip
TITANIC: Fix cruise button on ship controls
Diffstat (limited to 'engines/titanic/game')
-rw-r--r--engines/titanic/game/bridge_view.cpp8
-rw-r--r--engines/titanic/game/captains_wheel.cpp14
-rw-r--r--engines/titanic/game/captains_wheel.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/titanic/game/bridge_view.cpp b/engines/titanic/game/bridge_view.cpp
index 5b2b8809d9..f8429f06e3 100644
--- a/engines/titanic/game/bridge_view.cpp
+++ b/engines/titanic/game/bridge_view.cpp
@@ -68,7 +68,7 @@ bool CBridgeView::ActMsg(CActMsg *msg) {
_mode = 2;
setVisible(true);
playMovie(MOVIE_NOTIFY_OBJECT);
- } else if (msg->_action == "GoENd") {
+ } else if (msg->_action == "GoEnd") {
_mode = 3;
setVisible(true);
CChangeMusicMsg musicMsg;
@@ -87,20 +87,20 @@ bool CBridgeView::MovieEndMsg(CMovieEndMsg *msg) {
offMsg.execute("EngineSounds");
switch (_mode) {
- case 0:
case 1:
+ case 2:
setVisible(false);
decTransitions();
break;
- case 2: {
+ case 3: {
setVisible(false);
CActMsg actMsg("End");
actMsg.execute("HomeSequence");
break;
}
- case 3:
+ case 4:
setVisible(false);
changeView("TheEnd.Node 3.N");
break;
diff --git a/engines/titanic/game/captains_wheel.cpp b/engines/titanic/game/captains_wheel.cpp
index eabee7e418..1f0b177a67 100644
--- a/engines/titanic/game/captains_wheel.cpp
+++ b/engines/titanic/game/captains_wheel.cpp
@@ -34,14 +34,14 @@ BEGIN_MESSAGE_MAP(CCaptainsWheel, CBackground)
END_MESSAGE_MAP()
CCaptainsWheel::CCaptainsWheel() : CBackground(),
- _stopEnabled(false), _fieldE4(0), _fieldE8(0),
+ _stopEnabled(false), _actionNum(0), _fieldE8(0),
_cruiseEnabled(false), _goEnabled(false), _fieldF4(0) {
}
void CCaptainsWheel::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_stopEnabled, indent);
- file->writeNumberLine(_fieldE4, indent);
+ file->writeNumberLine(_actionNum, indent);
file->writeNumberLine(_fieldE8, indent);
file->writeNumberLine(_cruiseEnabled, indent);
file->writeNumberLine(_goEnabled, indent);
@@ -53,7 +53,7 @@ void CCaptainsWheel::save(SimpleFile *file, int indent) {
void CCaptainsWheel::load(SimpleFile *file) {
file->readNumber();
_stopEnabled = file->readNumber();
- _fieldE4 = file->readNumber();
+ _actionNum = file->readNumber();
_fieldE8 = file->readNumber();
_cruiseEnabled = file->readNumber();
_goEnabled = file->readNumber();
@@ -101,7 +101,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) {
if (!_stopEnabled) {
incTransitions();
_stopEnabled = false;
- _fieldE4 = 1;
+ _actionNum = 1;
CTurnOff offMsg;
offMsg.execute(this);
@@ -111,7 +111,7 @@ bool CCaptainsWheel::ActMsg(CActMsg *msg) {
if (_stopEnabled) {
incTransitions();
_stopEnabled = false;
- _fieldE4 = 2;
+ _actionNum = 2;
CTurnOff offMsg;
offMsg.execute(this);
@@ -183,7 +183,7 @@ bool CCaptainsWheel::MovieEndMsg(CMovieEndMsg *msg) {
}
if (msg->_endFrame == 168) {
- switch (_fieldE4) {
+ switch (_actionNum) {
case 1: {
CActMsg actMsg(starIsSolved() ? "GoEnd" : "Go");
actMsg.execute("GoSequence");
@@ -200,7 +200,7 @@ bool CCaptainsWheel::MovieEndMsg(CMovieEndMsg *msg) {
break;
}
- _fieldE4 = 0;
+ _actionNum = 0;
}
return true;
diff --git a/engines/titanic/game/captains_wheel.h b/engines/titanic/game/captains_wheel.h
index a8a85535d1..7dce1ac6ee 100644
--- a/engines/titanic/game/captains_wheel.h
+++ b/engines/titanic/game/captains_wheel.h
@@ -37,7 +37,7 @@ class CCaptainsWheel : public CBackground {
bool MovieEndMsg(CMovieEndMsg *msg);
public:
bool _stopEnabled;
- int _fieldE4;
+ int _actionNum;
int _fieldE8;
bool _cruiseEnabled;
bool _goEnabled;