[Scummvm-cvs-logs] SF.net SVN: scummvm:[50084] scummvm/trunk/engines/sci/graphics/palette.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50084
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50084&view=rev
Author:   m_kiewitz
Date:     2010-06-20 16:48:52 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
SCI: adding code for kPalVary ticks == 0 case, fixes pharkas

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 16:36:34 UTC (rev 50083)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 16:48:52 UTC (rev 50084)
@@ -506,6 +506,11 @@
 		_palVaryStep = 1;
 		_palVaryStepStop = stepStop;
 		_palVaryDirection = direction;
+		if (!ticks) {
+			// if no ticks are given, jump directly to destination
+			_palVaryDirection = stepStop;
+			ticks = 1;
+		}
 		// Call signal increase every [ticks]
 		g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60 * ticks, this);
 	}


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