amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-25 16:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Object's colour is actually a recolour offset

Browse Source
This commit is contained in:
Rubidium
2026-04-18 21:28:08 +02:00
committed by rubidium42
parent ba209c8745
commit 8bbad0dfaf
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object_cmd.cpp
+6 -6
View File
@@ -95,19 +95,19 @@ void BuildObject(ObjectType type, TileIndex tile, CompanyID owner, Town *town, u
/* If nothing owns the object, the colour will be random. Otherwise
* get the colour from the company's livery settings. */
if (owner == OWNER_NONE) {
o->colour = Random();
o->recolour_offset = Random();
} else {
o->colour = Company::Get(owner)->GetCompanyRecolourOffset(LS_DEFAULT);
o->recolour_offset = Company::Get(owner)->GetCompanyRecolourOffset(LS_DEFAULT);
}
/* If the object wants only one colour, then give it that colour. */
if (!spec->flags.Test(ObjectFlag::Uses2CC)) o->colour &= 0xF;
if (!spec->flags.Test(ObjectFlag::Uses2CC)) o->recolour_offset &= 0xF;
if (spec->callback_mask.Test(ObjectCallbackMask::Colour)) {
uint16_t res = GetObjectCallback(CBID_OBJECT_COLOUR, o->colour, 0, spec, o, tile);
uint16_t res = GetObjectCallback(CBID_OBJECT_COLOUR, o->recolour_offset, 0, spec, o, tile);
if (res != CALLBACK_FAILED) {
if (res >= 0x100) ErrorUnknownCallbackResult(spec->grf_prop.grfid, CBID_OBJECT_COLOUR, res);
o->colour = GB(res, 0, 8);
o->recolour_offset = GB(res, 0, 8);
}
}
@@ -192,7 +192,7 @@ void UpdateObjectColours(const Company *c)
/* Using the object colour callback, so not using company colour. */
if (spec->callback_mask.Test(ObjectCallbackMask::Colour)) continue;
obj->colour = c->GetCompanyRecolourOffset(LS_DEFAULT, spec->flags.Test(ObjectFlag::Uses2CC));
obj->recolour_offset = c->GetCompanyRecolourOffset(LS_DEFAULT, spec->flags.Test(ObjectFlag::Uses2CC));
}
}