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

[m_kiewitz at users.sourceforge.net]

Revision: 52326
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52326&view=rev
Author:   m_kiewitz
Date:     2010-08-24 11:21:32 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
SCI: dont load target palette when gameIsRestarting != 0

fixes sepia palette getting applied when loading in pharkas (part of bug #3051905)

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

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-08-24 11:18:48 UTC (rev 52325)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-08-24 11:21:32 UTC (rev 52326)
@@ -340,7 +340,8 @@
 		_sysPalette.timestamp++;
 
 	if (_palVaryResourceId != -1) {
-		palVaryLoadTargetPalette(pictureId);
+		if (g_sci->getEngineState()->gameIsRestarting == 0) // only if not restored nor restarted
+			palVaryLoadTargetPalette(pictureId);
 	}
 }
 


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