diff options
| author | Paul Gilbert | 2016-08-15 19:17:18 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-15 19:17:18 -0400 |
| commit | 08938ccfc88d55d9255ac20ff35c9aded67734fe (patch) | |
| tree | 844d5c4deb1e728b6c0b2226bc8402e6011099f2 /engines/titanic | |
| parent | e54dc36035aa7b66163064a0206c901bdf8ba5bd (diff) | |
| download | scummvm-rg350-08938ccfc88d55d9255ac20ff35c9aded67734fe.tar.gz scummvm-rg350-08938ccfc88d55d9255ac20ff35c9aded67734fe.tar.bz2 scummvm-rg350-08938ccfc88d55d9255ac20ff35c9aded67734fe.zip | |
TITANIC: Fix some compiler warnings
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/game/sgt/basin.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/sgt/bedfoot.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/liftbot.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/titanic/game/sgt/basin.cpp b/engines/titanic/game/sgt/basin.cpp index 3f85edc4ca..775c67deca 100644 --- a/engines/titanic/game/sgt/basin.cpp +++ b/engines/titanic/game/sgt/basin.cpp @@ -42,7 +42,7 @@ void CBasin::load(SimpleFile *file) { bool CBasin::TurnOn(CTurnOn *msg) { if (_statics->_v10 == "Open" && _statics->_v11 == "Closed" - || _statics->_v2 == "Closed") { + && _statics->_v2 == "Closed") { setVisible(true); _statics->_v11 = "Open"; _fieldE0 = 0; diff --git a/engines/titanic/game/sgt/bedfoot.cpp b/engines/titanic/game/sgt/bedfoot.cpp index b1837b15f6..ff7d64569a 100644 --- a/engines/titanic/game/sgt/bedfoot.cpp +++ b/engines/titanic/game/sgt/bedfoot.cpp @@ -55,7 +55,7 @@ bool CBedfoot::TurnOn(CTurnOn *msg) { playMovie(_startFrame, _endFrame, MOVIE_GAMESTATE); } else if (_statics->_v2 == "RestingUnderTV") { - _fieldE0; + _fieldE0 = 0; _startFrame = 8; if (_statics->_v10 == "Open") { _statics->_v2 = "Open"; diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp index fbaa60d800..3d6321bfb5 100644 --- a/engines/titanic/npcs/liftbot.cpp +++ b/engines/titanic/npcs/liftbot.cpp @@ -124,8 +124,7 @@ bool CLiftBot::TurnOn(CTurnOn *msg) { _enabled = true; if (!_flag) { if (compareTo("LiftBotTalking", 0)) { - CViewItem *view = findView(); - endTalking(this, MOVIE_REPEAT); + endTalking(this, MOVIE_REPEAT, findView()); petSetArea(PET_CONVERSATION); _flag = true; } |