aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-04-02 15:23:36 +0000
committerMax Horn2003-04-02 15:23:36 +0000
commitb8043f7570732d3192ea670e203ea3c9e689f1bb (patch)
tree3983dfdedfb8cc8e9db5e5e6faed088a99bda899
parent9041b45fc9efdec549193316e7c57358a7800ab6 (diff)
downloadscummvm-rg350-b8043f7570732d3192ea670e203ea3c9e689f1bb.tar.gz
scummvm-rg350-b8043f7570732d3192ea670e203ea3c9e689f1bb.tar.bz2
scummvm-rg350-b8043f7570732d3192ea670e203ea3c9e689f1bb.zip
fix for bug #695654
svn-id: r6900
-rw-r--r--scumm/gfx.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 111bd9a7b2..95b9eff0d4 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2040,6 +2040,7 @@ void Scumm::actorFollowCamera(int act) {
#pragma mark -
void Scumm::fadeIn(int effect) {
+ updatePalette();
switch (effect) {
case 1:
case 2:
@@ -2073,6 +2074,8 @@ void Scumm::fadeIn(int effect) {
void Scumm::fadeOut(int effect) {
VirtScreen *vs;
+ updatePalette();
+
setDirtyRange(0, 0, 0);
if (!(_features & GF_AFTER_V7))
camera._last.x = camera._cur.x;
@@ -2170,7 +2173,6 @@ void Scumm::transitionEffect(int a) {
// Draw the current state to the screen and wait half a sec so the user
// can watch the effect taking place.
- updatePalette();
_system->update_screen();
waitForTimer(30);
}
@@ -2260,8 +2262,6 @@ void Scumm::dissolveEffect(int width, int height) {
// most of the time is spent in waitForTimer(). It looks good to me,
// but might still need some tuning.
- updatePalette();
-
blits = 0;
blits_before_refresh = (3 * w * h) / 25;