summaryrefslogtreecommitdiff
path: root/src/blitter
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-03-14 18:16:29 +0000
committerrubidium <rubidium@openttd.org>2009-03-14 18:16:29 +0000
commit9d018723b7bab3341cd455708a6cd98283d75c34 (patch)
tree52ab96dc0e1aa14f6c966c67c4a94ba1762f9c15 /src/blitter
parent1692ce83122d1ed15206f160aea339761b173174 (diff)
downloadopenttd-9d018723b7bab3341cd455708a6cd98283d75c34.tar.xz
(svn r15711) -Codechange: lots of whitespace cleanup/fixes
Diffstat (limited to 'src/blitter')
-rw-r--r--src/blitter/32bpp_base.hpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/blitter/32bpp_base.hpp b/src/blitter/32bpp_base.hpp
index 7bbdf54d0..2b21d4607 100644
--- a/src/blitter/32bpp_base.hpp
+++ b/src/blitter/32bpp_base.hpp
@@ -97,12 +97,12 @@ public:
}
/**
- * Make a pixel looks like it is transparent.
- * @param colour the colour already on the screen.
- * @param nom the amount of transparency, nominator, makes colour lighter.
- * @param denom denominator, makes colour darker.
- * @return the new colour for the screen.
- */
+ * Make a pixel looks like it is transparent.
+ * @param colour the colour already on the screen.
+ * @param nom the amount of transparency, nominator, makes colour lighter.
+ * @param denom denominator, makes colour darker.
+ * @return the new colour for the screen.
+ */
static inline uint32 MakeTransparent(uint32 colour, uint nom, uint denom = 256)
{
uint r = GB(colour, 16, 8);
@@ -113,10 +113,10 @@ public:
}
/**
- * Make a colour grey - based.
- * @param colour the colour to make grey.
- * @return the new colour, now grey.
- */
+ * Make a colour grey - based.
+ * @param colour the colour to make grey.
+ * @return the new colour, now grey.
+ */
static inline uint32 MakeGrey(uint32 colour)
{
uint r = GB(colour, 16, 8);
@@ -124,8 +124,8 @@ public:
uint b = GB(colour, 0, 8);
/* To avoid doubles and stuff, multiple it with a total of 65536 (16bits), then
- * divide by it to normalize the value to a byte again. See heightmap.cpp for
- * information about the formula. */
+ * divide by it to normalize the value to a byte again. See heightmap.cpp for
+ * information about the formula. */
colour = ((r * 19595) + (g * 38470) + (b * 7471)) / 65536;
return ComposeColour(0xFF, colour, colour, colour);