diff options
| author | Max Horn | 2006-04-17 10:44:02 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-17 10:44:02 +0000 |
| commit | d7944e839b09b620b1d6c5af248208b4c01d7ae6 (patch) | |
| tree | 9002aec6bf51c1738ac5784ec22e1f1c18f032c7 | |
| parent | fe9f60e2196d2762c874740fff35dc0ed07ea5ad (diff) | |
| download | scummvm-rg350-d7944e839b09b620b1d6c5af248208b4c01d7ae6.tar.gz scummvm-rg350-d7944e839b09b620b1d6c5af248208b4c01d7ae6.tar.bz2 scummvm-rg350-d7944e839b09b620b1d6c5af248208b4c01d7ae6.zip | |
Since we define alpha value 255 to mean 'opaque', or T::kAlphaMask into the result of RGBToColor
svn-id: r21968
| -rw-r--r-- | graphics/colormasks.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/colormasks.h b/graphics/colormasks.h index 2e151fc67b..06a791c50d 100644 --- a/graphics/colormasks.h +++ b/graphics/colormasks.h @@ -219,7 +219,8 @@ struct ColorMasks<8888> { template<class T> uint32 RGBToColor(uint8 r, uint8 g, uint8 b) { - return ((r << T::kRedShift) & T::kRedMask) | + return T::kAlphaMask | + ((r << T::kRedShift) & T::kRedMask) | ((g << T::kGreenShift) & T::kGreenMask) | ((b << T::kBlueShift) & T::kBlueMask); } |