[Scummvm-cvs-logs] scummvm master -> ea52bcd28218cf8d9e3e81c4d7993372e4644aeb

Strangerke Strangerke at scummvm.org
Fri Jan 3 07:56:58 CET 2014


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:
ea52bcd282 TSAGE: Fix CID 1004060 - Logically dead code


Commit: ea52bcd28218cf8d9e3e81c4d7993372e4644aeb
    https://github.com/scummvm/scummvm/commit/ea52bcd28218cf8d9e3e81c4d7993372e4644aeb
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-02T22:56:18-08:00

Commit Message:
TSAGE: Fix CID 1004060 - Logically dead code

Changed paths:
    engines/tsage/core.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 7f27c43..16fe450 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2964,8 +2964,9 @@ void SceneObjectList::draw() {
 				g_globals->_sceneManager._sceneBgOffset.y);
 		}
 
-		// Set up the flag mask
-		uint32 flagMask = (paneNum == 0) ? OBJFLAG_PANE_0 : OBJFLAG_PANE_1;
+		// Set up the flag mask. Currently, paneNum is always set to 0, so the check is meaningless
+		// uint32 flagMask = (paneNum == 0) ? OBJFLAG_PANE_0 : OBJFLAG_PANE_1;
+		uint32 flagMask = OBJFLAG_PANE_0;
 
 		// Initial loop to set up object list and update object position, priority, and flags
 		for (SynchronizedList<SceneObject *>::iterator i = g_globals->_sceneObjects->begin();






More information about the Scummvm-git-logs mailing list