[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.35,2.36

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1210

Modified Files:
	gfx.cpp 
Log Message:
fix for bug #695654

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- gfx.cpp	24 Mar 2003 21:56:29 -0000	2.35
+++ gfx.cpp	2 Apr 2003 15:23:36 -0000	2.36
@@ -2040,6 +2040,7 @@
 #pragma mark -
 
 void Scumm::fadeIn(int effect) {
+	updatePalette();
 	switch (effect) {
 	case 1:
 	case 2:
@@ -2073,6 +2074,8 @@
 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 @@
 
 		// 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);
 	}
@@ -2259,8 +2261,6 @@
 	// the whole update should take about a quarter of a second, assuming
 	// 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;