[Scummvm-cvs-logs] SF.net SVN: scummvm:[38426] scummvm/branches/branch-0-13-0/engines/kyra/ screen.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Feb 17 18:18:26 CET 2009


Revision: 38426
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38426&view=rev
Author:   lordhoto
Date:     2009-02-17 17:18:26 +0000 (Tue, 17 Feb 2009)

Log Message:
-----------
Fix for long delay while fading palette in Zanthia's home, when mixing potions. (backport of r38425)

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/kyra/screen.cpp

Modified: scummvm/branches/branch-0-13-0/engines/kyra/screen.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/kyra/screen.cpp	2009-02-17 17:17:47 UTC (rev 38425)
+++ scummvm/branches/branch-0-13-0/engines/kyra/screen.cpp	2009-02-17 17:18:26 UTC (rev 38426)
@@ -422,10 +422,9 @@
 		maxDiff = MAX<uint8>(maxDiff, diff);
 	}
 
-	delayInc = delay << 8;
+	delayInc = (delay << 8) & 0x7FFF;
 	if (maxDiff != 0)
 		delayInc /= maxDiff;
-	delayInc &= 0x7FFF;
 
 	delay = delayInc;
 	for (diff = 1; diff <= maxDiff; ++diff) {


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