[Scummvm-cvs-logs] scummvm master -> 08938ccfc88d55d9255ac20ff35c9aded67734fe

dreammaster dreammaster at scummvm.org
Tue Aug 16 01:17:26 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
08938ccfc8 TITANIC: Fix some compiler warnings


Commit: 08938ccfc88d55d9255ac20ff35c9aded67734fe
    https://github.com/scummvm/scummvm/commit/08938ccfc88d55d9255ac20ff35c9aded67734fe
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-15T19:17:18-04:00

Commit Message:
TITANIC: Fix some compiler warnings

Changed paths:
    engines/titanic/game/sgt/basin.cpp
    engines/titanic/game/sgt/bedfoot.cpp
    engines/titanic/npcs/liftbot.cpp



diff --git a/engines/titanic/game/sgt/basin.cpp b/engines/titanic/game/sgt/basin.cpp
index 3f85edc..775c67d 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 b1837b1..ff7d645 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 fbaa60d..3d6321b 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;
 		}






More information about the Scummvm-git-logs mailing list