[Scummvm-git-logs] scummvm master -> af99606db8417ae69814907e16b3a89fbb1a1073

[dreammaster]

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:
af99606db8 TITANIC: Fix identified redundant tests & assignments


Commit: af99606db8417ae69814907e16b3a89fbb1a1073
    https://github.com/scummvm/scummvm/commit/af99606db8417ae69814907e16b3a89fbb1a1073
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-18T22:25:54-04:00

Commit Message:
TITANIC: Fix identified redundant tests & assignments

Changed paths:
    engines/titanic/core/game_object.cpp
    engines/titanic/game/transport/lift.cpp
    engines/titanic/true_talk/tt_parser.cpp


diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp
index 9678bfa..4534d09 100644
--- a/engines/titanic/core/game_object.cpp
+++ b/engines/titanic/core/game_object.cpp
@@ -868,7 +868,7 @@ void CGameObject::stopAnimTimer(int id) {
 void CGameObject::gotoView(const CString &viewName, const CString &clipName) {
 	CViewItem *newView = parseView(viewName);
 	CGameManager *gameManager = getGameManager();
-	CViewItem *oldView = gameManager ? gameManager->getView() : newView;
+	CViewItem *oldView = gameManager->getView();
 	if (!oldView || !newView)
 		return;
 
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index 2dfede3..614018f 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -100,8 +100,7 @@ bool CLift::StatusChangeMsg(CStatusChangeMsg *msg) {
 		354, 349, 344, 339, 334, 329, 324, 319, 299
 	};
 
-	if (pet)
-		pet->setRoomsFloorNum(floorNum);
+	pet->setRoomsFloorNum(floorNum);
 	if (pet->getRoomsElevatorNum() == 2 || pet->getRoomsElevatorNum() == 4) {
 		if (floorNum > 27)
 			floorNum = 27;
diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp
index 49f2338..3481587 100644
--- a/engines/titanic/true_talk/tt_parser.cpp
+++ b/engines/titanic/true_talk/tt_parser.cpp
@@ -401,7 +401,7 @@ int TTparser::replaceNumbers(TTstring &line, int startIndex) {
 		return index;
 
 	bool flag1 = false, flag2 = false, flag3 = false;
-	int total = 0, factor = 0, endIndex = index;
+	int total = 0, factor = 0, endIndex;
 
 	do {
 		if (!(numEntry->_flags & NF_1)) {