mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-28 06:34:33 +01:00
Code Issues Releases Wiki Activity

Codechange: Store custom station layouts in a map instead of nested vectors. (#12898)

Browse Source 
The map key is the platforms and length combined. This simplifies allocation and searching for layouts.
This commit is contained in:
Peter Nelson
2024-08-14 19:58:56 +01:00
committed by GitHub
parent 39465d7f5c
commit ff972ec4ff
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf.cpp
View File

@@ -2042,14 +2042,14 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, Byte
if (length == 0 || number == 0) break;
if (statspec->layouts.size() < length) statspec->layouts.resize(length);
if (statspec->layouts[length - 1].size() < number) statspec->layouts[length - 1].resize(number);
const uint8_t *buf_layout = buf.ReadBytes(length * number);
const uint8_t *layout = buf.ReadBytes(length * number);
statspec->layouts[length - 1][number - 1].assign(layout, layout + length * number);
/* Create entry in layouts and assign the layout to it. */
auto &layout = statspec->layouts[GetStationLayoutKey(number, length)];
layout.assign(buf_layout, buf_layout + length * number);
/* Ensure the first bit, axis, is zero. The rest of the value is validated during rendering, as we don't know the range yet. */
for (auto &tile : statspec->layouts[length - 1][number - 1]) {
for (auto &tile : layout) {
if ((tile & ~1U) != tile) {
GrfMsg(1, "StationChangeInfo: Invalid tile {} in layout {}x{}", tile, length, number);
tile &= ~1U;