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

[lordhoto at users.sourceforge.net]

Revision: 22910
Author:   lordhoto
Date:     2006-06-04 05:16:12 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22910&view=rev

Log Message:
-----------
Should fix strange palettes in some rooms.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene.cpp
Modified: scummvm/trunk/engines/kyra/scene.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene.cpp	2006-06-04 11:39:46 UTC (rev 22909)
+++ scummvm/trunk/engines/kyra/scene.cpp	2006-06-04 12:16:12 UTC (rev 22910)
@@ -831,14 +831,21 @@
 }
 
 void KyraEngine::initSceneScreen(int brandonAlive) {
-	// XXX (Pointless?) Palette stuff
+	// XXX Palette stuff
 	if (_unkScreenVar2 == 1) {
 		_screen->shuffleScreen(8, 8, 304, 128, 2, 0, _unkScreenVar3, false);
 	} else {
 		_screen->copyRegion(8, 8, 8, 8, 304, 128, 2, 0);
 	}
 	_screen->updateScreen();
-	// XXX More (pointless?) palette stuff
+	if (_unkScreenVar1 && _paletteChanged) {
+		if (!queryGameFlag(0xA0)) {
+			// XXX Palette stuff
+			_screen->setScreenPalette(_screen->_currentPalette);
+		} else {
+			// XXX Palette stuff
+		}
+	}
 
 	if (!_scriptInterpreter->startScript(_scriptClick, 2))
 		error("Could not start script function 2 of scene script");


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