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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sun Jan 24 20:42:17 CET 2010


Revision: 47514
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47514&view=rev
Author:   m_kiewitz
Date:     2010-01-24 19:42:12 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
SCI: handle intensity calls for amiga the same way as we handle palette animation (abort instead of process)

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

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-24 19:14:09 UTC (rev 47513)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-01-24 19:42:12 UTC (rev 47514)
@@ -585,6 +585,10 @@
 }
 
 void SciGui::paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette) {
+	// we are also called on Amiga as well, but for colors above 32, so it doesnt make sense
+	if (!_s->resMan->isVGA())
+		return;
+
 	_palette->setIntensity(fromColor, toColor, intensity, setPalette);
 }
 


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