aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2006-05-29 14:16:52 +0000
committerJohannes Schickel2006-05-29 14:16:52 +0000
commitbdceb581fd59a081aae2708af766f5930ca9647b (patch)
tree084cc78ac6c3dc539f08febc84a96d6899b7b03e
parent38537899b3f601feb542fadc62f46e44f11fd4c1 (diff)
downloadscummvm-rg350-bdceb581fd59a081aae2708af766f5930ca9647b.tar.gz
scummvm-rg350-bdceb581fd59a081aae2708af766f5930ca9647b.tar.bz2
scummvm-rg350-bdceb581fd59a081aae2708af766f5930ca9647b.zip
- cleanup
- uses working getColorAlphaImpl for alpha == 0 in getColorAlpha svn-id: r22740
-rw-r--r--gui/ThemeNew.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/gui/ThemeNew.cpp b/gui/ThemeNew.cpp
index 55bb334485..ed1c64374f 100644
--- a/gui/ThemeNew.cpp
+++ b/gui/ThemeNew.cpp
@@ -641,7 +641,6 @@ void ThemeNew::drawSurface(const Common::Rect &r, const Graphics::Surface &surfa
drawSurface(rect, &surface, false, false, alpha);
addDirtyRect(rect);
- return;
}
void ThemeNew::drawSlider(const Common::Rect &rr, int width, kState state) {
@@ -1628,7 +1627,7 @@ inline OverlayColor getColorAlphaImp2(OverlayColor col1, OverlayColor col2, int
}
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 {