[Scummvm-cvs-logs] SF.net SVN: scummvm:[48474] scummvm/trunk/engines/sci/graphics

[m_kiewitz at users.sourceforge.net]

Revision: 48474
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48474&view=rev
Author:   m_kiewitz
Date:     2010-04-02 18:48:17 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
SCI: change actual setting of palette, fixes gk1 palette issue when talking to grace indirectly caused by r47955, seems to also fix jones palette issue, could cause regressions

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/graphics/palette.h

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-04-02 17:55:43 UTC (rev 48473)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-04-02 18:48:17 UTC (rev 48474)
@@ -192,10 +192,14 @@
 	bool paletteChanged;
 
 	if (force || sciPal->timestamp != systime) {
-		paletteChanged = merge(sciPal, &_sysPalette, force, forceRealMerge);
+		_sysPaletteChanged |= merge(sciPal, &_sysPalette, force, forceRealMerge);
 		sciPal->timestamp = _sysPalette.timestamp;
-		if (paletteChanged && _screen->_picNotValid == 0 && systime != _sysPalette.timestamp)
+		if (_sysPaletteChanged && _screen->_picNotValid == 0) { // && systime != _sysPalette.timestamp) {
+			// Removed timestamp checking, because this shouldnt be needed anymore. I'm leaving it commented just in
+			//  case this causes regressions
 			setOnScreen();
+			_sysPaletteChanged = false;
+		}
 	}
 }
 

Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h	2010-04-02 17:55:43 UTC (rev 48473)
+++ scummvm/trunk/engines/sci/graphics/palette.h	2010-04-02 18:48:17 UTC (rev 48474)
@@ -75,6 +75,8 @@
 	uint32 _palVaryStart;
 	uint32 _palVaryEnd;
 
+	bool _sysPaletteChanged;
+
 	Common::Array<PalSchedule> _schedules;
 };
 


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