aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorMartin Kiewitz2010-08-24 11:21:32 +0000
committerMartin Kiewitz2010-08-24 11:21:32 +0000
commit347accf2d77729f95f4cefe73df10d198e915e85 (patch)
treecb992531ce045bdd2a50cc6e013839d3e849326e /engines/sci/graphics
parentefdbb076a2c33623a06f4cb02a333655c96de3f8 (diff)
downloadscummvm-rg350-347accf2d77729f95f4cefe73df10d198e915e85.tar.gz
scummvm-rg350-347accf2d77729f95f4cefe73df10d198e915e85.tar.bz2
scummvm-rg350-347accf2d77729f95f4cefe73df10d198e915e85.zip
SCI: dont load target palette when gameIsRestarting != 0
fixes sepia palette getting applied when loading in pharkas (part of bug #3051905) svn-id: r52326
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/palette.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 5c17f76558..2135adcc62 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -340,7 +340,8 @@ void GfxPalette::drewPicture(GuiResourceId pictureId) {
_sysPalette.timestamp++;
if (_palVaryResourceId != -1) {
- palVaryLoadTargetPalette(pictureId);
+ if (g_sci->getEngineState()->gameIsRestarting == 0) // only if not restored nor restarted
+ palVaryLoadTargetPalette(pictureId);
}
}