diff options
| author | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
| commit | e94fabc37407a7d300af04493b0f5cbced42a092 (patch) | |
| tree | 998bfaa03109a49d2bb9ec5b17e817ef7cc32a4c /engines/tsage/core.cpp | |
| parent | 165b8be77f4621ff5de8a483c6cd9ac497492a0a (diff) | |
| parent | 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (diff) | |
| download | scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.gz scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.bz2 scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/tsage/core.cpp')
| -rw-r--r-- | engines/tsage/core.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 7f27c43a22..16fe45044b 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(); |