diff options
author | Johannes Schickel | 2009-10-31 19:52:46 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-10-31 19:52:46 +0000 |
commit | 45208bc53d8bf43b2b30697787f17db6a1247e91 (patch) | |
tree | 8fc1c4b74309f7196f60e04d04a052e0097685b8 /engines/kyra | |
parent | b29fd4dacd54e672ffa52179dd02e0367ef14707 (diff) | |
download | scummvm-rg350-45208bc53d8bf43b2b30697787f17db6a1247e91.tar.gz scummvm-rg350-45208bc53d8bf43b2b30697787f17db6a1247e91.tar.bz2 scummvm-rg350-45208bc53d8bf43b2b30697787f17db6a1247e91.zip |
Fix certain scenes incorrectly appearing as fireberry bushes in floppy/FM-Towns/PC98 versions of Kyrandia 1.
svn-id: r45580
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/script_lok.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index 6c26e02d53..81b8687b67 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -1123,9 +1123,14 @@ int KyraEngine_LoK::o1_findBrightestFireberry(EMCState *script) { if (_currentCharacter->sceneId >= 187 && _currentCharacter->sceneId <= 198) return 29; - if (_currentCharacter->sceneId == 133 || _currentCharacter->sceneId == 137 || - _currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173) - return 29; + // The following rooms are only a "A fireberry bush" scene, in the CD talkie version + // of the game, in all other versions they are a usual dark cave, thus we do not + // return a glow value of "29" over here. + if (_flags.isTalkie) { + if (_currentCharacter->sceneId == 133 || _currentCharacter->sceneId == 137 || + _currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173) + return 29; + } if (_itemInHand == 28) return 28; |