[Scummvm-cvs-logs] SF.net SVN: scummvm:[45580] scummvm/trunk/engines/kyra/script_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 45580
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45580&view=rev
Author:   lordhoto
Date:     2009-10-31 19:52:46 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Fix certain scenes incorrectly appearing as fireberry bushes in floppy/FM-Towns/PC98 versions of Kyrandia 1.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_lok.cpp

Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp	2009-10-31 19:48:28 UTC (rev 45579)
+++ scummvm/trunk/engines/kyra/script_lok.cpp	2009-10-31 19:52:46 UTC (rev 45580)
@@ -1123,9 +1123,14 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.