[Scummvm-cvs-logs] scummvm master -> 48ffd0255d565b0bbadfdb335deb4866b9bbe840

[Strangerke]

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:
48ffd0255d VOYEUR: Disable the if statement with identical statements in its branches, add a comment


Commit: 48ffd0255d565b0bbadfdb335deb4866b9bbe840
    https://github.com/scummvm/scummvm/commit/48ffd0255d565b0bbadfdb335deb4866b9bbe840
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-06-08T09:52:36+02:00

Commit Message:
VOYEUR: Disable the if statement with identical statements in its branches, add a comment

Changed paths:
    engines/voyeur/files.cpp



diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 346fd24..300e086 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;