dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Fix parent/child type of sprite register analysis

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-10-26 23:07:28 +01:00
parent 9feebe72ca
commit f41624d7b2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/newgrf_optimiser.cpp
View File

@@ -2492,15 +2492,13 @@ void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &state,
const TileLayoutSpriteGroup *tlsg = (const TileLayoutSpriteGroup*)sg; const TileLayoutSpriteGroup *tlsg = (const TileLayoutSpriteGroup*)sg;
if (tlsg->dts.registers != nullptr) { if (tlsg->dts.registers != nullptr) {
const TileLayoutRegisters *registers = tlsg->dts.registers; const TileLayoutRegisters *registers = tlsg->dts.registers;
size_t count = 1; // 1 for the ground sprite
const DrawTileSeqStruct *element; auto process_registers = [&](uint i, bool is_parent) {
foreach_draw_tile_seq(element, tlsg->dts.seq) count++;
for (size_t i = 0; i < count; i ++) {
const TileLayoutRegisters *reg = registers + i; const TileLayoutRegisters *reg = registers + i;
if (reg->flags & TLF_DODRAW) bits.set(reg->dodraw, true); if (reg->flags & TLF_DODRAW) bits.set(reg->dodraw, true);
if (reg->flags & TLF_SPRITE) bits.set(reg->sprite, true); if (reg->flags & TLF_SPRITE) bits.set(reg->sprite, true);
if (reg->flags & TLF_PALETTE) bits.set(reg->palette, true); if (reg->flags & TLF_PALETTE) bits.set(reg->palette, true);
if (element->IsParentSprite()) { if (is_parent) {
if (reg->flags & TLF_BB_XY_OFFSET) { if (reg->flags & TLF_BB_XY_OFFSET) {
bits.set(reg->delta.parent[0], true); bits.set(reg->delta.parent[0], true);
bits.set(reg->delta.parent[1], true); bits.set(reg->delta.parent[1], true);
@@ -2510,6 +2508,14 @@ void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &state,
if (reg->flags & TLF_CHILD_X_OFFSET) bits.set(reg->delta.child[0], true); if (reg->flags & TLF_CHILD_X_OFFSET) bits.set(reg->delta.child[0], true);
if (reg->flags & TLF_CHILD_Y_OFFSET) bits.set(reg->delta.child[1], true); if (reg->flags & TLF_CHILD_Y_OFFSET) bits.set(reg->delta.child[1], true);
} }
};
process_registers(0, false);
uint offset = 0; // offset 0 is the ground sprite
const DrawTileSeqStruct *element;
foreach_draw_tile_seq(element, tlsg->dts.seq) {
offset++;
process_registers(offset, element->IsParentSprite());
} }
} }
} }