[Scummvm-cvs-logs] SF.net SVN: scummvm: [22740] scummvm/trunk/gui/ThemeNew.cpp

[lordhoto at users.sourceforge.net]

Revision: 22740
Author:   lordhoto
Date:     2006-05-29 07:16:52 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22740&view=rev

Log Message:
-----------
- cleanup
- uses working getColorAlphaImpl for alpha == 0 in getColorAlpha

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeNew.cpp
Modified: scummvm/trunk/gui/ThemeNew.cpp
===================================================================
--- scummvm/trunk/gui/ThemeNew.cpp	2006-05-29 14:15:19 UTC (rev 22739)
+++ scummvm/trunk/gui/ThemeNew.cpp	2006-05-29 14:16:52 UTC (rev 22740)
@@ -641,7 +641,6 @@
 
 	drawSurface(rect, &surface, false, false, alpha);
 	addDirtyRect(rect);
-	return;
 }
 
 void ThemeNew::drawSlider(const Common::Rect &rr, int width, kState state) {
@@ -1628,7 +1627,7 @@
 }
 
 OverlayColor getColorAlpha(OverlayColor col1, OverlayColor col2, int alpha) {
-	if (alpha > 0) {
+	if (alpha >= 0) {
 		if (gBitFormat == 565) {
 			return getColorAlphaImpl<ColorMasks<565> >(col1, col2, alpha);
 		} else {


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