diff options
| author | David Corrales | 2007-08-05 19:34:20 +0000 |
|---|---|---|
| committer | David Corrales | 2007-08-05 19:34:20 +0000 |
| commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
| tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/touche/opcodes.cpp | |
| parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
| parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
| download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip | |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/touche/opcodes.cpp')
| -rw-r--r-- | engines/touche/opcodes.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/touche/opcodes.cpp b/engines/touche/opcodes.cpp index f0ef748fbd..2680ab0fae 100644 --- a/engines/touche/opcodes.cpp +++ b/engines/touche/opcodes.cpp @@ -828,10 +828,16 @@ void ToucheEngine::op_setHitBoxText() { void ToucheEngine::op_fadePalette() { debugC(9, kDebugOpcodes, "ToucheEngine::op_fadePalette()"); int16 fadeOut = _script.readNextWord(); + int colorsCount = 240; + // Workaround for bug #1751149. Script triggers a palette fading, but some + // of the room graphics use palette colors >= 240. + if (_currentEpisodeNum == 104 && _currentRoomNum == 68) { + colorsCount = 256; + } if (fadeOut) { - fadePalette(0, 240, 255, -2, 128); + fadePalette(0, colorsCount, 255, -2, 128); } else { - fadePalette(0, 240, 0, 2, 128); + fadePalette(0, colorsCount, 0, 2, 128); } } |