diff options
| author | Eugene Sandulenko | 2011-11-03 01:27:53 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-11-03 01:34:53 +0000 |
| commit | 55b95e3f50198e93873fc57440b37ac5fbe5b153 (patch) | |
| tree | 5a4e7995048de9a1cd0a6c5e9f2d3537e5d55ead | |
| parent | 31e5b96fae452e7f4d71dedf8e4303887a971728 (diff) | |
| download | scummvm-rg350-55b95e3f50198e93873fc57440b37ac5fbe5b153.tar.gz scummvm-rg350-55b95e3f50198e93873fc57440b37ac5fbe5b153.tar.bz2 scummvm-rg350-55b95e3f50198e93873fc57440b37ac5fbe5b153.zip | |
SCUMM: Fix copy/paste errors
| -rw-r--r-- | engines/scumm/debugger.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/palette.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp index 9cfdfbccc9..54f7fea97b 100644 --- a/engines/scumm/debugger.cpp +++ b/engines/scumm/debugger.cpp @@ -292,7 +292,7 @@ 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) { + } else if (_vm->_game.features & GF_SMALL_HEADER) { // FIXME: This never was executed if (_vm->_game.version == 4) file.seek(8, SEEK_CUR); size = file.readUint32LE(); diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp index 2c10758730..bd085dd4d5 100644 --- a/engines/scumm/palette.cpp +++ b/engines/scumm/palette.cpp @@ -823,7 +823,7 @@ void ScummEngine::setShadowPalette(int slot, int redScale, int greenScale, int b if (slot < 0 || slot >= NUM_SHADOW_PALETTE) error("setShadowPalette: invalid slot %d", slot); - if (startColor < 0 || startColor > 255 || endColor < 0 || startColor > 255 || endColor < startColor) + if (startColor < 0 || startColor > 255 || endColor < 0 || endColor > 255 || endColor < startColor) error("setShadowPalette: invalid range from %d to %d", startColor, endColor); table = _shadowPalette + slot * 256; |