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

[lordhoto at users.sourceforge.net]

Revision: 41362
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41362&view=rev
Author:   lordhoto
Date:     2009-06-08 02:26:33 +0000 (Mon, 08 Jun 2009)

Log Message:
-----------
- Fix Screen_v2::wsaFrameAnimationStep, now the MR album and LoL intro demo WSAs will be correctly played
- Made album page change in MR a bit slower, so it's visible at least

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/gui_mr.cpp
    scummvm/trunk/engines/kyra/screen_v2.cpp

Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-07 23:29:11 UTC (rev 41361)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp	2009-06-08 02:26:33 UTC (rev 41362)
@@ -979,25 +979,25 @@
 
 		_screen->copyRegion(260, 7, 260, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0xA0, 0x07, 0xA0, 0x07, 0x96, 0xBA, 0x32, 0xBA, srcPage, 0, 2);
 
 		_screen->copyRegion(210, 7, 210, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->copyRegion(160, 7, 160, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0x10, 0x07, 0x6E, 0x07, 0x96, 0xBA, 0x32, 0xBA, 2, 0, 2);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0x10, 0x07, 0x3C, 0x07, 0x96, 0xBA, 0x64, 0xBA, 2, 0, 2);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->copyRegion(10, 7, 10, 7, 150, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
@@ -1006,25 +1006,25 @@
 
 		_screen->copyRegion(10, 7, 10, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0x0A, 0x07, 0x6E, 0x07, 0x96, 0xBA, 0x32, 0xBA, srcPage, 0, 2);
 
 		_screen->copyRegion(60, 7, 60, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->copyRegion(110, 7, 110, 7, 50, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0xA0, 0x07, 0xA0, 0x07, 0x96, 0xBA, 0x32, 0xBA, 2, 0, 2);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->wsaFrameAnimationStep(0xA0, 0x07, 0xA0, 0x07, 0x96, 0xBA, 0x64, 0xBA, 2, 0, 2);
 		_screen->updateScreen();
-		delayWithTicks(1);
+		delayWithTicks(2);
 
 		_screen->copyRegion(160, 7, 160, 7, 150, 186, 2, 0, Screen::CR_NO_P_CHECK);
 		_screen->updateScreen();

Modified: scummvm/trunk/engines/kyra/screen_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_v2.cpp	2009-06-07 23:29:11 UTC (rev 41361)
+++ scummvm/trunk/engines/kyra/screen_v2.cpp	2009-06-08 02:26:33 UTC (rev 41362)
@@ -428,6 +428,9 @@
 		memcpy(dst + x2 + cdm.sx, _wsaFrameAnimBuffer + na, w2);
 		dst += 320;
 	} while (++nb < h2);
+
+	if (!dstPage)
+		addDirtyRect(x2, y2, w2, h2);
 }
 
 bool Screen_v2::calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, int &x2, int &y2, int &w2) {


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