cpp/openttd-patchpack/source Changeset - r16954:6d8610a72e63

Changeset - r16954:6d8610a72e63

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 13 years ago 2011-01-03 11:55:08
rubidium@openttd.org

(svn r21700) -Codechange: GetDrawStringCompanyColour returns a TextColour

2 files changed with 5 insertions and 4 deletions:

src/company_cmd.cpp

src/company_gui.h

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -116,10 +116,10 @@ void SetLocalCompany(CompanyID new_compa @@
  * @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;
+}
 /**

src/company_gui.h

➞

Show inline comments

@@ @@ -13,8 +13,9 @@ @@
 #define COMPANY_GUI_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 ShowCompanyStations(CompanyID company);

0 comments (0 inline, 0 general)