aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-06-08 09:50:29 +0200
committerStrangerke2014-06-08 09:52:36 +0200
commit48ffd0255d565b0bbadfdb335deb4866b9bbe840 (patch)
treefbc9f200f87725f79b272f105bb8891209c305b6
parent560812bd5e46240c3a9ec074a11ba9169e95ce19 (diff)
downloadscummvm-rg350-48ffd0255d565b0bbadfdb335deb4866b9bbe840.tar.gz
scummvm-rg350-48ffd0255d565b0bbadfdb335deb4866b9bbe840.tar.bz2
scummvm-rg350-48ffd0255d565b0bbadfdb335deb4866b9bbe840.zip
VOYEUR: Disable the if statement with identical statements in its branches, add a comment
-rw-r--r--engines/voyeur/files.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 346fd2419e..300e086f75 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -1056,13 +1056,18 @@ PictureResource::PictureResource(BoltFilesState &state, const byte *src):
byte *imgData = state._curLibPtr->boltEntry(id)._picResource->_imgData;
_freeImgData = DisposeAfterUse::NO;
+#if 0
// TODO: Double check code below. Despite different coding in the
- // original, both looked like they do the same formula
+ // original, both looked like they do the same formula.
+ // Until it's clarified, this check is disabled and replaced by the
+ // common code.
if (_flags & PICFLAG_PIC_OFFSET) {
_imgData = imgData + (READ_LE_UINT32(&src[18]) & 0xffff);
} else {
_imgData = imgData + (READ_LE_UINT32(&src[18]) & 0xffff);
}
+#endif
+ _imgData = imgData + (READ_LE_UINT32(&src[18]) & 0xffff);
}
} else if (_flags & PICFLAG_PIC_OFFSET) {
int mode = 0;