[Scummvm-cvs-logs] SF.net SVN: scummvm:[45274] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 45274
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45274&view=rev
Author:   m_kiewitz
Date:     2009-10-20 16:18:29 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
SCI/newgui: kPalette/animate - accidentally changed speed to uint16 in prev. revision although its signed

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-20 16:11:31 UTC (rev 45273)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-20 16:18:29 UTC (rev 45274)
@@ -602,7 +602,7 @@
 		case 4: {
 			uint16 fromColor = argv[1].toUint16();
 			uint16 toColor = argv[2].toUint16();
-			uint16 speed = argv[3].toSint16();
+			int16 speed = argv[3].toSint16();
 			s->_gui->paletteAnimate(fromColor, toColor, speed);
 			break;
 		}

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-20 16:11:31 UTC (rev 45273)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-20 16:18:29 UTC (rev 45274)
@@ -469,7 +469,7 @@
 	_palette->setIntensity(fromColor, toColor, intensity, setPalette);
 }
 
-void SciGui::paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed) {
+void SciGui::paletteAnimate(uint16 fromColor, uint16 toColor, int16 speed) {
 	// we are also called on Amiga as well, but for colors above 32, so it doesnt make sense
 	if (!_s->resMan->isVGA())
 		return;

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-20 16:11:31 UTC (rev 45273)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-20 16:18:29 UTC (rev 45274)
@@ -103,7 +103,7 @@
 	virtual void paletteSet(GuiResourceId resourceNo, uint16 flags);
 	virtual int16 paletteFind(uint16 r, uint16 g, uint16 b);
 	virtual void paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette);
-	virtual void paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed);
+	virtual void paletteAnimate(uint16 fromColor, uint16 toColor, int16 speed);
 
 	virtual void shakeScreen(uint16 shakeCount, uint16 directions);
 


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