diff options
| author | Paul Gilbert | 2017-09-18 22:25:54 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-09-18 22:25:54 -0400 |
| commit | af99606db8417ae69814907e16b3a89fbb1a1073 (patch) | |
| tree | 1db848638a7efa83d86ab2adde2f67f2de07d5ac | |
| parent | 3d4bc3c59b652acd53fa6307e53db7ad5a500f30 (diff) | |
| download | scummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.tar.gz scummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.tar.bz2 scummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.zip | |
TITANIC: Fix identified redundant tests & assignments
| -rw-r--r-- | engines/titanic/core/game_object.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/game/transport/lift.cpp | 3 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_parser.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 9678bfa562..4534d09724 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 2dfede3d63..614018f447 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 49f233888b..3481587b8d 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)) { |