diff options
| author | Johannes Schickel | 2009-08-11 01:47:29 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-08-11 01:47:29 +0000 |
| commit | 7e1949dbbda07cfe9b301478fa4cb3cf83fcb6c3 (patch) | |
| tree | 132779351cb92bf1b7a97f6fca6e04e7efeaec88 /engines/kyra/sequences_lok.cpp | |
| parent | f419386d71baa34369024e28c2fa39bc9589dc9d (diff) | |
| download | scummvm-rg350-7e1949dbbda07cfe9b301478fa4cb3cf83fcb6c3.tar.gz scummvm-rg350-7e1949dbbda07cfe9b301478fa4cb3cf83fcb6c3.tar.bz2 scummvm-rg350-7e1949dbbda07cfe9b301478fa4cb3cf83fcb6c3.zip | |
Fix crash when using Will-O-Wisp in the grotto.
svn-id: r43249
Diffstat (limited to 'engines/kyra/sequences_lok.cpp')
| -rw-r--r-- | engines/kyra/sequences_lok.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index 177225be3b..1ddd061499 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -718,10 +718,16 @@ void KyraEngine_LoK::seq_makeBrandonWisp() { _animator->animRefreshNPC(0); _animator->updateAllObjectShapes(); - if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) - _screen->fadeSpecialPalette(30, 234, 13, 4); - else if (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186) - _screen->fadeSpecialPalette(14, 228, 15, 4); + if (_flags.platform == Common::kPlatformAmiga) { + if ((_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) || + (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186)) + _screen->fadePalette(_screen->getPalette(10), 0x54); + } else { + if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) + _screen->fadeSpecialPalette(30, 234, 13, 4); + else if (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186) + _screen->fadeSpecialPalette(14, 228, 15, 4); + } freeShapes123(); _screen->showMouse(); |