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

[m_kiewitz at users.sourceforge.net]

Revision: 45194
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45194&view=rev
Author:   m_kiewitz
Date:     2009-10-17 17:35:41 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
SCI/newgui: set amiga palette immediately at game start and stop kPalette/animate to do anything on Amiga

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

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-17 16:56:33 UTC (rev 45193)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-17 17:35:41 UTC (rev 45194)
@@ -469,6 +469,10 @@
 }
 
 void SciGui::paletteAnimate(int fromColor, int toColor, int speed) {
+	// kAnimate gets called for Amiga as well, but for colors above 32, so it doesnt make sense
+	if (!_s->resMan->isVGA())
+		return;
+
 	_palette->animate(fromColor, toColor, speed);
 }
 

Modified: scummvm/trunk/engines/sci/gui/gui_palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-17 16:56:33 UTC (rev 45193)
+++ scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-17 17:35:41 UTC (rev 45194)
@@ -131,6 +131,7 @@
 			_sysPalette.colors[curColor].b = (byte2 & 0x0F) * 0x11;
 		}
 		file.close();
+		setOnScreen();
 		return true;
 	}
 	return false;
@@ -278,6 +279,7 @@
 	GuiColor col;
 	int len = toColor - fromColor - 1;
 	uint32 now = g_system->getMillis() * 60 / 1000;;
+
 	// search for sheduled animations with the same 'from' value
 	int sz = _schedules.size();
 	for (int i = 0; i < sz; i++) {


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