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 | 89e1afdaa0bfea874d86a8dc2590d49c257ec611 (patch) | |
tree | 211b57e3a81eed5791f5b6b9709252af6f7d8503 /src/company_cmd.cpp | |
parent | c7f3daacbf57e8213550f5bca3226565cbafe5e3 (diff) | |
download | openttd-89e1afdaa0bfea874d86a8dc2590d49c257ec611.tar.xz |
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
Diffstat (limited to 'src/company_cmd.cpp')
-rw-r--r-- | src/company_cmd.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 3ef64862a..f86d9cad2 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -97,17 +97,17 @@ bool IsHumanCompany(CompanyID company) } -uint16 GetDrawStringCompanyColor(CompanyID company) +uint16 GetDrawStringCompanyColour(CompanyID company) { - /* Get the color for DrawString-subroutines which matches the color + /* Get the colour for DrawString-subroutines which matches the colour * of the company */ - if (!IsValidCompanyID(company)) return _colour_gradient[COLOUR_WHITE][4] | IS_PALETTE_COLOR; - return (_colour_gradient[_company_colours[company]][4]) | IS_PALETTE_COLOR; + if (!IsValidCompanyID(company)) return _colour_gradient[COLOUR_WHITE][4] | IS_PALETTE_COLOUR; + return (_colour_gradient[_company_colours[company]][4]) | IS_PALETTE_COLOUR; } void DrawCompanyIcon(CompanyID c, int x, int y) { - DrawSprite(SPR_PLAYER_ICON, COMPANY_SPRITE_COLOR(c), x, y); + DrawSprite(SPR_PLAYER_ICON, COMPANY_SPRITE_COLOUR(c), x, y); } /** @@ -352,7 +352,7 @@ static Colours GenerateCompanyColour() } }; - /* Move the colors that look similar to each company's color to the side */ + /* Move the colours that look similar to each company's colour to the side */ Company *c; FOR_ALL_COMPANIES(c) { Colours pcolour = (Colours)c->colour; @@ -374,7 +374,7 @@ static Colours GenerateCompanyColour() } } - /* Return the first available color */ + /* Return the first available colour */ for (uint i = 0; i < COLOUR_END; i++) { if (colours[i] != INVALID_COLOUR) return colours[i]; } |