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

(svn r20919) -Fix [FS#4140]: objects didn't change colour when the company changed colour. Now they do, except when the "decide colour" callback is (defined to be) used

This commit is contained in:
rubidium 2010-10-12 19:48:42 +00:00
parent 3866ecad38
commit feece0b42c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/company_cmd.cpp
View File

@ -986,6 +986,9 @@ CommandCost CmdSetCompanyColour(TileIndex tile, DoCommandFlag flags, uint32 p1,
FOR_ALL_VEHICLES(v) {
if (v->owner == _current_company) v->InvalidateNewGRFCache();
}
extern void UpdateObjectColours(const Company *c);
UpdateObjectColours(c);
}
return CommandCost();
}

21
src/object_cmd.cpp
View File

@ -128,6 +128,27 @@ void UpdateCompanyHQ(TileIndex tile, uint score)
}
}
/**
* Updates the colour of the object whenever a company changes.
* @param c The company the company colour changed of.
*/
void UpdateObjectColours(const Company *c)
{
Object *obj;
FOR_ALL_OBJECTS(obj) {
Owner owner = GetTileOwner(obj->location.tile);
/* Not the current owner, so colour doesn't change. */
if (owner != c->index) continue;
const ObjectSpec *spec = ObjectSpec::GetByTile(obj->location.tile);
/* Using the object colour callback, so not using company colour. */
if (HasBit(spec->callback_mask, CBM_OBJ_COLOUR)) continue;
const Livery *l = c->livery;
obj->colour = ((spec->flags & OBJECT_FLAG_2CC_COLOUR) ? (l->colour2 * 16) : 0) + l->colour1;
}
}
extern CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z, bool check_bridge);
static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags);