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

Use std::vector for extra station name strings

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-06-19 20:03:42 +01:00
parent 1e0279e72e
commit eda50ef6a5
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@@ -2925,11 +2925,11 @@ static ChangeInfoResult GlobalVarChangeInfo(uint gvid, int numinfo, int prop, co
if (MappedPropertyLengthMismatch(buf, 4, mapping_entry)) break;
uint16_t str = buf->ReadWord();
uint16_t flags = buf->ReadWord();
if (_extra_station_names_used < MAX_EXTRA_STATION_NAMES) {
ExtraStationNameInfo &info = _extra_station_names[_extra_station_names_used];
AddStringForMapping(str, &info.str);
if (_extra_station_names.size() < MAX_EXTRA_STATION_NAMES) {
size_t idx = _extra_station_names.size();
ExtraStationNameInfo &info = _extra_station_names.emplace_back();
AddStringForMapping(str, idx, [](StringID str, size_t idx) { _extra_station_names[idx].str = str; });
info.flags = flags;
_extra_station_names_used++;
}
break;
}