mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15281) -Fix: company could never have auto-assigned colour 0 (dark blue)

release/0.7
smatz 2009-01-27 01:15:29 +00:00
parent 43121fc2cb
commit 9cf1a19762
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/company_cmd.cpp
View File

@ -330,7 +330,7 @@ static const Colours _similar_colour[COLOUR_END][2] = {
{ COLOUR_GREY, INVALID_COLOUR }, // COLOUR_WHITE { COLOUR_GREY, INVALID_COLOUR }, // COLOUR_WHITE
}; };
static byte GenerateCompanyColour() static Colours GenerateCompanyColour()
{ {
Colours colours[COLOUR_END]; Colours colours[COLOUR_END];
@ -426,10 +426,13 @@ Company *DoStartupNewCompany(bool is_ai)
{ {
if (!Company::CanAllocateItem()) return NULL; if (!Company::CanAllocateItem()) return NULL;
/* we have to generate colour before this company is valid */
Colours colour = GenerateCompanyColour();
Company *c = new Company(STR_SV_UNNAMED, is_ai); Company *c = new Company(STR_SV_UNNAMED, is_ai);
/* Make a color */ c->colour = colour;
c->colour = GenerateCompanyColour();
ResetCompanyLivery(c); ResetCompanyLivery(c);
_company_colours[c->index] = c->colour; _company_colours[c->index] = c->colour;