aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-22 21:24:52 +0000
committerMartin Kiewitz2010-06-22 21:24:52 +0000
commit04c04ff01ee4e6288d8600661c67aebee8b959b3 (patch)
tree9d6af8234de77611dc8d091e88361aa7ca87034d /engines/sci
parentd8968ee5b95d62fd357dfec163436f7f164e5244 (diff)
downloadscummvm-rg350-04c04ff01ee4e6288d8600661c67aebee8b959b3.tar.gz
scummvm-rg350-04c04ff01ee4e6288d8600661c67aebee8b959b3.tar.bz2
scummvm-rg350-04c04ff01ee4e6288d8600661c67aebee8b959b3.zip
SCI: eco quest 1 demo also uses inbetween sci1.1 interpreter, fixing graphics
svn-id: r50170
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/palette.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index b0969ceb74..385c3f4e3e 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -66,14 +66,16 @@ GfxPalette::GfxPalette(ResourceManager *resMan, GfxScreen *screen)
// 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();
}