diff options
| author | Martin Kiewitz | 2010-06-17 16:36:01 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-06-17 16:36:01 +0000 |
| commit | 5daa17473ba3b21683f111989eaa1156f72171cd (patch) | |
| tree | 0e006c89463fd4b515b48811fd8b4578c1d81ee6 /engines | |
| parent | 7bb48adda7e9e04fb1b8a6ccce38b29a143ba835 (diff) | |
| download | scummvm-rg350-5daa17473ba3b21683f111989eaa1156f72171cd.tar.gz scummvm-rg350-5daa17473ba3b21683f111989eaa1156f72171cd.tar.bz2 scummvm-rg350-5daa17473ba3b21683f111989eaa1156f72171cd.zip | |
SCI: applying forceRealMerge change to pq1 and qfg3 demo as well (see r49936) for now
svn-id: r49938
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 608c2339f5..1b2e5f410e 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -64,8 +64,14 @@ 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 (!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() { |