mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-21 03:12:41 +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

14
src/station_cmd.cpp
View File

@@ -1127,13 +1127,13 @@ static inline uint8_t *CreateMulti(uint8_t *layout, int n, uint8_t b)
*/
void GetStationLayout(uint8_t *layout, uint numtracks, uint plat_len, const StationSpec *statspec)
{
if (statspec != nullptr && statspec->layouts.size() >= plat_len &&
statspec->layouts[plat_len - 1].size() >= numtracks &&
!statspec->layouts[plat_len - 1][numtracks - 1].empty()) {
/* Custom layout defined, follow it. */
memcpy(layout, statspec->layouts[plat_len - 1][numtracks - 1].data(),
static_cast<size_t>(plat_len) * numtracks);
return;
if (statspec != nullptr) {
auto found = statspec->layouts.find(GetStationLayoutKey(numtracks, plat_len));
if (found != std::end(statspec->layouts)) {
/* Custom layout defined, copy to buffer. */
std::copy(std::begin(found->second), std::end(found->second), layout);
return;
}
}
if (plat_len == 1) {