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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu Jun 17 18:36:02 CEST 2010


Revision: 49938
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49938&view=rev
Author:   m_kiewitz
Date:     2010-06-17 16:36:01 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
SCI: applying forceRealMerge change to pq1 and qfg3 demo as well (see r49936) for now

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-06-17 16:09:06 UTC (rev 49937)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-17 16:36:01 UTC (rev 49938)
@@ -64,8 +64,14 @@
 	//  It's not using the SCI1.1 palette merging (copying over all the colors) but the real merging
 	//  If we use the copying over, we will get issues because some views have marked all colors as being used
 	//  and those will overwrite the current palette in that case
+	// Quest for Glory 3 demo and police quest 1 vga behave the same interpreter wise and all have glitches, if we don't
+	//  switch back
 	if (!strcmp(g_sci->getGameID(), "laurabow2") && (g_sci->isDemo()))
 		_alwaysForceRealMerge = true;
+	if (!strcmp(g_sci->getGameID(), "qfg3") && (g_sci->isDemo()))
+		_alwaysForceRealMerge = true;
+	if (!strcmp(g_sci->getGameID(), "pq1sci"))
+		_alwaysForceRealMerge = true;
 }
 
 GfxPalette::~GfxPalette() {


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




More information about the Scummvm-git-logs mailing list