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

Codechange: Make TileLayoutSpriteGroup::ProcessRegisters return a DrawTileSpriteSpan on the stack, instead of a reference to a global.

Browse Source
This commit is contained in:
frosch
2025-05-05 18:51:26 +02:00
committed by frosch
parent 51a7edd941
commit d9c43e7fda
11 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/station_cmd.cpp
View File

@@ -3076,7 +3076,7 @@ bool SplitGroundSpriteForOverlay(const TileInfo *ti, SpriteID *ground, RailTrack
static void DrawTile_Station(TileInfo *ti)
{
const NewGRFSpriteLayout *layout = nullptr;
DrawTileSpriteSpan tmp_rail_layout;
DrawTileSpriteSpan tmp_layout;
const DrawTileSprites *t = nullptr;
int32_t total_offset;
const RailTypeInfo *rti = nullptr;
@@ -3273,8 +3273,8 @@ draw_default_foundation:
uint32_t var10_relocation = GetCustomStationRelocation(statspec, st, ti->tile, var10);
layout->ProcessRegisters(var10, var10_relocation, separate_ground);
}
tmp_rail_layout.seq = layout->GetLayout(&tmp_rail_layout.ground);
t = &tmp_rail_layout;
tmp_layout = layout->GetLayout();
t = &tmp_layout;
total_offset = 0;
} else if (statspec != nullptr) {
/* Simple sprite layout */
@@ -3337,7 +3337,8 @@ draw_default_foundation:
if (type == StationType::RoadWaypoint && stop_draw_mode.Test(RoadStopDrawMode::WaypGround)) {
draw_ground = true;
}
t = group->ProcessRegisters(nullptr);
tmp_layout = group->ProcessRegisters(nullptr);
t = &tmp_layout;
}
}