amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +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-17 21:22:53 +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/newgrf_object.cpp
+2 -2
View File
@@ -340,7 +340,7 @@ static uint32_t GetCountAndDistanceOfClosestInstance(const ResolverObject &objec
case 0x46: return DistanceSquare(this->tile, t->xy);
/* Object colour */
case 0x47: return this->obj->colour;
case 0x47: return this->obj->recolour_offset;
/* Object view */
case 0x48: return this->obj->view;
@@ -449,7 +449,7 @@ uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2
*/
static void DrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, const ObjectSpec *spec)
{
PaletteID palette = (spec->flags.Test(ObjectFlag::Uses2CC) ? SPR_2CCMAP_BASE : PALETTE_RECOLOUR_START) + Object::GetByTile(ti->tile)->colour;
PaletteID palette = (spec->flags.Test(ObjectFlag::Uses2CC) ? SPR_2CCMAP_BASE : PALETTE_RECOLOUR_START) + Object::GetByTile(ti->tile)->recolour_offset;
SpriteID image = dts.ground.sprite;
PaletteID pal = dts.ground.pal;