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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Sep 18 14:38:11 CEST 2009


Revision: 44182
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44182&view=rev
Author:   lordhoto
Date:     2009-09-18 12:38:11 +0000 (Fri, 18 Sep 2009)

Log Message:
-----------
Call updateScreen after setScreenPalette in olol_restoreMagicShroud, so that the palette is updated correctly.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_lol.cpp

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-18 11:41:20 UTC (rev 44181)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-09-18 12:38:11 UTC (rev 44182)
@@ -2192,8 +2192,8 @@
 	for (int i = 0; i < 21; i++) {
 		uint32 etime = _system->getMillis() + 20 * _tickLength;
 		mov->displayFrame(i, 0, 0, 0, 0, 0, 0);
+		_screen->setScreenPalette(**tpal3++);
 		_screen->updateScreen();
-		_screen->setScreenPalette(**tpal3++);
 
 		if (i == 2 || i == 5 || i == 8 || i == 11 || i == 13 || i == 15 || i == 17 || i == 19)
 			snd_playSoundEffect(95, -1);
@@ -2207,11 +2207,11 @@
 	for (int i = 22; i < 38; i++) {
 		uint32 etime = _system->getMillis() + 12 * _tickLength;
 		mov->displayFrame(i, 0, 0, 0, 0, 0, 0);
-		_screen->updateScreen();
 		if (i == 22 || i == 24 || i == 28 || i == 32) {
 			snd_playSoundEffect(131, -1);
 			_screen->setScreenPalette(**tpal3++);
 		}
+		_screen->updateScreen();
 		delayUntil(etime);
 	}
 


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




More information about the Scummvm-git-logs mailing list