diff options
author | rubidium <rubidium@openttd.org> | 2009-02-09 02:57:15 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-02-09 02:57:15 +0000 |
commit | c0a8d09ca72873bbbef14dd317cbd29319e54640 (patch) | |
tree | 211b57e3a81eed5791f5b6b9709252af6f7d8503 /src/network/network_chat_gui.cpp | |
parent | 90e2465d7d2c770707feeaebfebbe56bd76383f1 (diff) | |
download | openttd-c0a8d09ca72873bbbef14dd317cbd29319e54640.tar.xz |
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
Diffstat (limited to 'src/network/network_chat_gui.cpp')
-rw-r--r-- | src/network/network_chat_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp index 948aa5942..f38b4a04d 100644 --- a/src/network/network_chat_gui.cpp +++ b/src/network/network_chat_gui.cpp @@ -60,7 +60,7 @@ static inline uint GetChatMessageCount() /** * Add a text message to the 'chat window' to be shown - * @param color The colour this message is to be shown in + * @param colour The colour this message is to be shown in * @param duration The duration of the chat message in game-days * @param message message itself in printf() style */ @@ -96,7 +96,7 @@ void CDECL NetworkAddChatMessage(TextColour colour, uint8 duration, const char * /* The default colour for a message is company colour. Replace this with * white for any additional lines */ - cmsg->colour = (bufp == buf && colour & IS_PALETTE_COLOR) ? colour : (TextColour)(0x1D - 15) | IS_PALETTE_COLOR; + cmsg->colour = (bufp == buf && colour & IS_PALETTE_COLOUR) ? colour : (TextColour)(0x1D - 15) | IS_PALETTE_COLOUR; cmsg->end_date = _date + duration; bufp += strlen(bufp) + 1; // jump to 'next line' in the formatted string @@ -232,7 +232,7 @@ void NetworkDrawChatMessage() _screen.height - _chatmsg_box.y - count * NETWORK_CHAT_LINE_HEIGHT - 2, _chatmsg_box.x + _chatmsg_box.width - 1, _screen.height - _chatmsg_box.y - 2, - PALETTE_TO_TRANSPARENT, FILLRECT_RECOLOR // black, but with some alpha for background + PALETTE_TO_TRANSPARENT, FILLRECT_RECOLOUR // black, but with some alpha for background ); /* Paint the chat messages starting with the lowest at the bottom */ |