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

[m_kiewitz at users.sourceforge.net]

Revision: 45103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45103&view=rev
Author:   m_kiewitz
Date:     2009-10-15 06:50:42 +0000 (Thu, 15 Oct 2009)

Log Message:
-----------
SCI/newgui: SciGuiTransitions now doesnt fade in/out color 255 anymore

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 06:37:05 UTC (rev 45102)
+++ scummvm/trunk/engines/sci/gui/gui_transitions.cpp	2009-10-15 06:50:42 UTC (rev 45103)
@@ -137,12 +137,12 @@
 	g_system->grabPalette(oldPalette, 0, 256);
 
 	for (stepNr = 100; stepNr >= 0; stepNr -= 10) {
-		for (colorNr = 0; colorNr < 256; colorNr++){
+		for (colorNr = 1; colorNr < 255; colorNr++){
 			workPalette[colorNr * 4 + 0] = oldPalette[colorNr * 4] * stepNr / 100;
 			workPalette[colorNr * 4 + 1] = oldPalette[colorNr * 4 + 1] * stepNr / 100;
 			workPalette[colorNr * 4 + 2] = oldPalette[colorNr * 4 + 2] * stepNr / 100;
 		}
-		g_system->setPalette(workPalette, 0, 256);
+		g_system->setPalette(workPalette + 4, 1, 254);
 		_gui->wait(2);
 	}
 }
@@ -154,13 +154,13 @@
 	int16 stepNr, colorNr;
 
 	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
-		for (colorNr = 0; colorNr < 256; colorNr++){
+		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, 0, 256);
+		g_system->setPalette(workPalette + 4, 1, 254);
 		_gui->wait(2);
 	}
 }


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