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

[m_kiewitz at users.sourceforge.net]

Revision: 45106
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45106&view=rev
Author:   m_kiewitz
Date:     2009-10-15 08:03:01 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiTransitions fadeIn now uses setIntensity() like sierra sci does, fixes blackout in longbow and others

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

Modified: scummvm/trunk/engines/sci/gui/gui_transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-15 07:50:10 UTC (rev 45105)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-15 08:03:01 UTC (rev 45106)
@@ -151,16 +151,10 @@
 void SciGuiTransitions::fadeIn() {
 	byte workPalette[4 * 256];
 	GuiPalette *newPalette = &_palette->_sysPalette;
-	int16 stepNr, colorNr;
+	int16 stepNr;
 
 	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
-		for (colorNr = 1; colorNr < 255; colorNr++){
-			workPalette[colorNr * 4 + 0] = newPalette->colors[colorNr].r * stepNr / 100;
-			workPalette[colorNr * 4 + 1] = newPalette->colors[colorNr].g * stepNr / 100;
-			workPalette[colorNr * 4 + 2] = newPalette->colors[colorNr].b * stepNr / 100;
-			workPalette[colorNr * 4 + 3] = 100;
-		}
-		g_system->setPalette(workPalette + 4, 1, 254);
+		_palette->setIntensity(1, 254, 100, true);
 		_gui->wait(2);
 	}
 }


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