(svn r19566) -Fix (r11216, r11202): don't return a random colour for unowned industries in var 45; TTDPatch doesn't seem to set the colour data in that case either.

This commit is contained in:
rubidium 2010-04-05 21:18:32 +00:00
parent bc925c0016
commit 20f9379529

View File

@ -218,7 +218,7 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
/* Company info */
case 0x45: {
byte colours;
byte colours = 0;
bool is_ai = false;
const Company *c = Company::GetIfValid(industry->founder);
@ -227,8 +227,6 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par
is_ai = c->is_ai;
colours = l->colour1 + l->colour2 * 16;
} else {
colours = GB(Random(), 0, 8);
}
return industry->founder | (is_ai ? 0x10000 : 0) | (colours << 24);