mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r21700) -Codechange: GetDrawStringCompanyColour returns a TextColour

This commit is contained in:
rubidium 2011-01-03 11:55:08 +00:00
parent 6b5992788c
commit 1c2d56d314
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/company_cmd.cpp
View File

@ -116,10 +116,10 @@ void SetLocalCompany(CompanyID new_company)
* @param company Company to get the colour of. * @param company Company to get the colour of.
* @return Colour of \a company. * @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; if (!Company::IsValidID(company)) return (TextColour)_colour_gradient[COLOUR_WHITE][4] | TC_IS_PALETTE_COLOUR;
return (_colour_gradient[_company_colours[company]][4]) | TC_IS_PALETTE_COLOUR; return (TextColour)_colour_gradient[_company_colours[company]][4] | TC_IS_PALETTE_COLOUR;
} }
/** /**

3
src/company_gui.h
View File

@ -13,8 +13,9 @@
#define COMPANY_GUI_H #define COMPANY_GUI_H
#include "company_type.h" #include "company_type.h"
#include "gfx_type.h"
uint16 GetDrawStringCompanyColour(CompanyID company); TextColour GetDrawStringCompanyColour(CompanyID company);
void DrawCompanyIcon(CompanyID c, int x, int y); void DrawCompanyIcon(CompanyID c, int x, int y);
void ShowCompanyStations(CompanyID company); void ShowCompanyStations(CompanyID company);