From ee79aba82d23d033f2677ac9f5f85c85189252f3 Mon Sep 17 00:00:00 2001
From: D G Turner
Date: Fri, 4 Oct 2019 07:58:10 +0100
Subject: SCUMM: Fix GCC Duplicated Condition Warning

These are flagged by GCC if -Wduplicated-cond is enabled.
---
 engines/scumm/debugger.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 4dff43c6c3..48c5017bfc 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -303,12 +303,15 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) {
 		if (_vm->_game.features & GF_SMALL_HEADER) {
 			size = file.readUint16LE();
 			file.seek(-2, SEEK_CUR);
-		} else if (_vm->_game.features & GF_SMALL_HEADER) { // FIXME: This never was executed
+#if 0
+		// FIXME: This never was executed due to duplicated if condition
+		} else if (_vm->_game.features & GF_SMALL_HEADER) {
 			if (_vm->_game.version == 4)
 				file.seek(8, SEEK_CUR);
 			size = file.readUint32LE();
 			file.readUint16LE();
 			file.seek(-6, SEEK_CUR);
+#endif
 		} else {
 			file.readUint32BE();
 			size = file.readUint32BE();
-- 
cgit v1.2.3