diff options
| author | D G Turner | 2019-10-04 07:58:10 +0100 |
|---|---|---|
| committer | D G Turner | 2019-10-04 07:58:10 +0100 |
| commit | ee79aba82d23d033f2677ac9f5f85c85189252f3 (patch) | |
| tree | 7cd6b88fa154374ea3cf2cd454c7435c5f4fdf62 /engines/scumm | |
| parent | 4a2cbd94b69f2c0c3b58e46a97245981cd75965e (diff) | |
| download | scummvm-rg350-ee79aba82d23d033f2677ac9f5f85c85189252f3.tar.gz scummvm-rg350-ee79aba82d23d033f2677ac9f5f85c85189252f3.tar.bz2 scummvm-rg350-ee79aba82d23d033f2677ac9f5f85c85189252f3.zip | |
SCUMM: Fix GCC Duplicated Condition Warning
These are flagged by GCC if -Wduplicated-cond is enabled.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/debugger.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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(); |