miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Move SpriteLayoutProcessor's operations closer to the ResolverObject.

Browse Source
This commit is contained in:
frosch
2025-05-05 21:11:44 +02:00
committed by frosch
parent 0ffdc86a2c
commit 74030a63e6
9 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_object.cpp
View File

@@ -439,13 +439,11 @@ uint16_t GetObjectCallback(CallbackID callback, uint32_t param1, uint32_t param2
/**
* Draw an group of sprites on the map.
* @param ti Information about the tile to draw on.
* @param group The group of sprites to draw.
* @param dts The sprite layout to draw.
* @param spec Object spec to draw.
*/
static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, const ObjectSpec *spec)
static void DrawTileLayout(const TileInfo *ti, const DrawTileSpriteSpan &dts, const ObjectSpec *spec)
{
auto processor = group->ProcessRegisters(nullptr);
auto dts = processor.GetLayout();
PaletteID palette = (spec->flags.Test(ObjectFlag::Uses2CC) ? SPR_2CCMAP_BASE : PALETTE_RECOLOUR_START) + Object::GetByTile(ti->tile)->colour;
SpriteID image = dts.ground.sprite;
@@ -477,7 +475,9 @@ void DrawNewObjectTile(TileInfo *ti, const ObjectSpec *spec)
const auto *group = object.Resolve<TileLayoutSpriteGroup>();
if (group == nullptr) return;
DrawTileLayout(ti, group, spec);
auto processor = group->ProcessRegisters(nullptr);
auto dts = processor.GetLayout();
DrawTileLayout(ti, dts, spec);
}
/**