diff options
author | rubidium <rubidium@openttd.org> | 2009-02-09 02:09:47 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-02-09 02:09:47 +0000 |
commit | 8dae160d0f1065ff40ecddc518b3905820f77f7a (patch) | |
tree | 36a060def733fe274859ec2afcbf3478faf2e63c /src/gfx_func.h | |
parent | 861e9cefb3c31f1cab46ddb068af7a3648f45b4a (diff) | |
download | openttd-8dae160d0f1065ff40ecddc518b3905820f77f7a.tar.xz |
(svn r15425) -Codechange: some color->colour changes and type safety.
Diffstat (limited to 'src/gfx_func.h')
-rw-r--r-- | src/gfx_func.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gfx_func.h b/src/gfx_func.h index b6a7a91ad..eedf34604 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -85,27 +85,27 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo); void DrawSprite(SpriteID img, SpriteID pal, int x, int y, const SubSprite *sub = NULL); -int DrawStringCentered(int x, int y, StringID str, uint16 color); -int DrawStringCenteredTruncated(int xl, int xr, int y, StringID str, uint16 color); -int DoDrawStringCentered(int x, int y, const char *str, uint16 color); +int DrawStringCentered(int x, int y, StringID str, TextColour colour); +int DrawStringCenteredTruncated(int xl, int xr, int y, StringID str, TextColour colour); +int DoDrawStringCentered(int x, int y, const char *str, TextColour colour); -int DrawString(int x, int y, StringID str, uint16 color); -int DrawStringTruncated(int x, int y, StringID str, uint16 color, uint maxw); +int DrawString(int x, int y, StringID str, TextColour colour); +int DrawStringTruncated(int x, int y, StringID str, TextColour colour, uint maxw); -int DoDrawString(const char *string, int x, int y, uint16 real_colour, bool parse_string_also_when_clipped = false); -int DoDrawStringTruncated(const char *str, int x, int y, uint16 color, uint maxw); +int DoDrawString(const char *string, int x, int y, TextColour colour, bool parse_string_also_when_clipped = false); +int DoDrawStringTruncated(const char *str, int x, int y, TextColour colour, uint maxw); -void DrawStringCenterUnderline(int x, int y, StringID str, uint16 color); -void DrawStringCenterUnderlineTruncated(int xl, int xr, int y, StringID str, uint16 color); +void DrawStringCenterUnderline(int x, int y, StringID str, TextColour colour); +void DrawStringCenterUnderlineTruncated(int xl, int xr, int y, StringID str, TextColour colour); -int DrawStringRightAligned(int x, int y, StringID str, uint16 color); -void DrawStringRightAlignedTruncated(int x, int y, StringID str, uint16 color, uint maxw); -void DrawStringRightAlignedUnderline(int x, int y, StringID str, uint16 color); +int DrawStringRightAligned(int x, int y, StringID str, TextColour colour); +void DrawStringRightAlignedTruncated(int x, int y, StringID str, TextColour colour, uint maxw); +void DrawStringRightAlignedUnderline(int x, int y, StringID str, TextColour colour); -void DrawCharCentered(uint32 c, int x, int y, uint16 color); +void DrawCharCentered(uint32 c, int x, int y, TextColour colour); -void GfxFillRect(int left, int top, int right, int bottom, int color, FillRectMode mode = FILLRECT_OPAQUE); -void GfxDrawLine(int left, int top, int right, int bottom, int color); +void GfxFillRect(int left, int top, int right, int bottom, int colour, FillRectMode mode = FILLRECT_OPAQUE); +void GfxDrawLine(int left, int top, int right, int bottom, int colour); void DrawBox(int x, int y, int dx1, int dy1, int dx2, int dy2, int dx3, int dy3); Dimension GetStringBoundingBox(const char *str); |