aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/core
diff options
context:
space:
mode:
authorPaul Gilbert2017-09-18 22:25:54 -0400
committerPaul Gilbert2017-09-18 22:25:54 -0400
commitaf99606db8417ae69814907e16b3a89fbb1a1073 (patch)
tree1db848638a7efa83d86ab2adde2f67f2de07d5ac /engines/titanic/core
parent3d4bc3c59b652acd53fa6307e53db7ad5a500f30 (diff)
downloadscummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.tar.gz
scummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.tar.bz2
scummvm-rg350-af99606db8417ae69814907e16b3a89fbb1a1073.zip
TITANIC: Fix identified redundant tests & assignments
Diffstat (limited to 'engines/titanic/core')
-rw-r--r--engines/titanic/core/game_object.cpp2
1 files changed, 1 insertions, 1 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;