thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix GCC Duplicated Condition Warning

Browse source 
These are flagged by GCC if -Wduplicated-cond is enabled.
This commit is contained in:
D G Turner 2019-10-04 07:58:10 +01:00
parent 4a2cbd94b6
commit ee79aba82d
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/scumm/debugger.cpp
View file

@ -303,12 +303,15 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) {
if (_vm->_game.features & GF_SMALL_HEADER) { if (_vm->_game.features & GF_SMALL_HEADER) {
size = file.readUint16LE(); size = file.readUint16LE();
file.seek(-2, SEEK_CUR); 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) if (_vm->_game.version == 4)
file.seek(8, SEEK_CUR); file.seek(8, SEEK_CUR);
size = file.readUint32LE(); size = file.readUint32LE();
file.readUint16LE(); file.readUint16LE();
file.seek(-6, SEEK_CUR); file.seek(-6, SEEK_CUR);
#endif
} else { } else {
file.readUint32BE(); file.readUint32BE();
size = file.readUint32BE(); size = file.readUint32BE();