[Scummvm-cvs-logs] SF.net SVN: scummvm: [25320] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 25320
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25320&view=rev
Author:   lordhoto
Date:     2007-02-01 05:10:49 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
Fix for missing Brandon in Zanthia's home (see bug #1498221 "KYRA1: Subtitles missing when meeting Zanthia
").

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/screen.h

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2007-02-01 10:42:27 UTC (rev 25319)
+++ scummvm/trunk/engines/kyra/screen.cpp	2007-02-01 13:10:49 UTC (rev 25320)
@@ -138,6 +138,16 @@
 	if (_disableScreen)
 		return;
 
+	updateDirtyRects();
+
+	_forceFullUpdate = false;
+	_numDirtyRects = 0;
+	//for debug reasons (needs 640x200 screen)
+	//_system->copyRectToScreen(getPagePtr(2), SCREEN_W, 320, 0, SCREEN_W, SCREEN_H);
+	_system->updateScreen();
+}
+
+void Screen::updateDirtyRects() {
 	if (_forceFullUpdate) {
 		_system->copyRectToScreen(getCPagePtr(0), SCREEN_W, 0, 0, SCREEN_W, SCREEN_H);
 	} else {
@@ -149,9 +159,6 @@
 	}
 	_forceFullUpdate = false;
 	_numDirtyRects = 0;
-	//for debug reasons (needs 640x200 screen)
-	//_system->copyRectToScreen(getPagePtr(2), SCREEN_W, 320, 0, SCREEN_W, SCREEN_H);
-	_system->updateScreen();
 }
 
 uint8 *Screen::getPagePtr(int pageNum) {
@@ -237,6 +244,8 @@
 
 void Screen::fadePalette(const uint8 *palData, int delay) {
 	debugC(9, kDebugLevelScreen, "Screen::fadePalette(%p, %d)", (const void *)palData, delay);
+	updateDirtyRects();
+
 	uint8 fadePal[768];
 	memcpy(fadePal, _screenPalette, 768);
 	uint8 diff, maxDiff = 0;

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2007-02-01 10:42:27 UTC (rev 25319)
+++ scummvm/trunk/engines/kyra/screen.h	2007-02-01 13:10:49 UTC (rev 25320)
@@ -200,6 +200,7 @@
 
 private:
 	uint8 *getPagePtr(int pageNum);
+	void updateDirtyRects();
 
 	int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size);
 	void restoreMouseRect();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.