From 1c2d56d314d5be9d228b08ca6eea8d988f2a389f Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 3 Jan 2011 11:55:08 +0000 Subject: (svn r21700) -Codechange: GetDrawStringCompanyColour returns a TextColour --- src/company_cmd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/company_cmd.cpp') diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index b39bed5fc..3cec65c44 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -116,10 +116,10 @@ void SetLocalCompany(CompanyID new_company) * @param company Company to get the colour of. * @return Colour of \a company. */ -uint16 GetDrawStringCompanyColour(CompanyID company) +TextColour GetDrawStringCompanyColour(CompanyID company) { - if (!Company::IsValidID(company)) return _colour_gradient[COLOUR_WHITE][4] | TC_IS_PALETTE_COLOUR; - return (_colour_gradient[_company_colours[company]][4]) | TC_IS_PALETTE_COLOUR; + if (!Company::IsValidID(company)) return (TextColour)_colour_gradient[COLOUR_WHITE][4] | TC_IS_PALETTE_COLOUR; + return (TextColour)_colour_gradient[_company_colours[company]][4] | TC_IS_PALETTE_COLOUR; } /** -- cgit v1.2.3-54-g00ecf