diff options
| author | Filippos Karapetis | 2009-07-16 08:13:08 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-07-16 08:13:08 +0000 |
| commit | 00dbbedbad2c3d58f972733a4f0d46935c32887a (patch) | |
| tree | 497fb4ed0ee0b63b4e2d5d608f48429ae94af3b1 /engines/sci/gfx/operations.cpp | |
| parent | b04e3e79406031001cd80b40fb21b8f2ca0c5af8 (diff) | |
| download | scummvm-rg350-00dbbedbad2c3d58f972733a4f0d46935c32887a.tar.gz scummvm-rg350-00dbbedbad2c3d58f972733a4f0d46935c32887a.tar.bz2 scummvm-rg350-00dbbedbad2c3d58f972733a4f0d46935c32887a.zip | |
Added a detection entry for Pepper's Adventures in Time, and fixed an issue with _gfxop_set_pic(), which was causing crashes in that game
svn-id: r42523
Diffstat (limited to 'engines/sci/gfx/operations.cpp')
| -rw-r--r-- | engines/sci/gfx/operations.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index 2c536912b3..9b2c3dc7f5 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -1712,8 +1712,11 @@ static int _gfxop_set_pic(GfxState *state) { // FIXME: The _gfxop_install_pixmap call below updates the OSystem palette. // This is too soon, since it causes brief palette corruption until the // screen is updated too. (Possibly related: EngineState::pic_not_valid .) - state->pic->visual_map->palette->forceInto(state->driver->getMode()->palette); - _gfxop_install_pixmap(state->driver, state->pic->visual_map); + // SCI1.1 games don't use per-picture palettes + if (state->gfxResMan->getVersion() < SCI_VERSION_1_1) { + state->pic->visual_map->palette->forceInto(state->driver->getMode()->palette); + _gfxop_install_pixmap(state->driver, state->pic->visual_map); + } #ifdef CUSTOM_GRAPHICS_OPTIONS if (state->options->pic0_unscaled) |