[Scummvm-cvs-logs] SF.net SVN: scummvm:[45584] scummvm/branches/branch-1-0-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 45584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45584&view=rev
Author:   lordhoto
Date:     2009-10-31 20:00:50 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Backport of r45580, r45581 and r45583.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/screen_lok.cpp
    scummvm/branches/branch-1-0-0/engines/kyra/script_lok.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/screen_lok.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/screen_lok.cpp	2009-10-31 19:59:48 UTC (rev 45583)
+++ scummvm/branches/branch-1-0-0/engines/kyra/screen_lok.cpp	2009-10-31 20:00:50 UTC (rev 45584)
@@ -253,6 +253,7 @@
 		paletteMap(i, pal[i * 3 + 0] << 2, pal[i * 3 + 1] << 2, pal[i * 3 + 2] << 2);
 
 	set16ColorPalette(_palette16);
+	_forceFullUpdate = true;
 }
 
 void Screen_LoK_16::fadePalette(const Palette &pal, int delay, const UpdateFunctor *upFunc) {

Modified: scummvm/branches/branch-1-0-0/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/script_lok.cpp	2009-10-31 19:59:48 UTC (rev 45583)
+++ scummvm/branches/branch-1-0-0/engines/kyra/script_lok.cpp	2009-10-31 20:00:50 UTC (rev 45584)
@@ -1166,9 +1166,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 version
+	// of Kyrandia 1. In all other versions they are a usual dark cave, thus we do only
+	// return a glow value of "29" over here, when we are running a CD version.
+	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.