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

[m_kiewitz at users.sourceforge.net]

Revision: 50170
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50170&view=rev
Author:   m_kiewitz
Date:     2010-06-22 21:24:52 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
SCI: eco quest 1 demo also uses inbetween sci1.1 interpreter, fixing graphics

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-22 21:05:34 UTC (rev 50169)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-22 21:24:52 UTC (rev 50170)
@@ -66,14 +66,16 @@
 	//  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 (g_sci->getGameId() == "laurabow2" && (g_sci->isDemo()))
-		_alwaysForceRealMerge = true;
-	else if (g_sci->getGameId() == "qfg3" && (g_sci->isDemo()))
-		_alwaysForceRealMerge = true;
-	else if (g_sci->getGameId() == "pq1sci")
-		_alwaysForceRealMerge = true;
+	// Quest for Glory 3 demo, Eco Quest 1 demo and police quest 1 vga behave the same interpreter wise and all have glitches,
+	//  if we don't switch back
+	Common::String gameId = g_sci->getGameId();
+	if (g_sci->isDemo()) {
+		if (gameId == "laurabow2" || gameId == "qfg3" || gameId == "ecoquest")
+			_alwaysForceRealMerge = true;
+	} else {
+		if (gameId == "pq1sci")
+			_alwaysForceRealMerge = true;
+	}
 
 	palVaryInit();
 }


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