From 48ffd0255d565b0bbadfdb335deb4866b9bbe840 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 8 Jun 2014 09:50:29 +0200
Subject: VOYEUR: Disable the if statement with identical statements in its
 branches, add a comment

---
 engines/voyeur/files.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engines/voyeur')

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;
-- 
cgit v1.2.3