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

Adjust order of station name assignments

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-04-18 22:56:18 +01:00
parent a54416afbc
commit b6c967aae3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/station_cmd.cpp
View File

@@ -313,9 +313,6 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
if (HasBit(free_names, M(STR_SV_STNAME)) && (is_central || DistanceSquare(tile, t->xy) <= t->cache.squared_town_zone_radius[HZB_TOWN_INNER_SUBURB])) {
return STR_SV_STNAME;
}
if (is_central && HasBit(free_names, M(STR_SV_STNAME_CENTRAL))) {
return STR_SV_STNAME_CENTRAL;
}
bool use_extra_names = _extra_station_names_used > 0;
auto check_extra_names = [&]() -> bool {
@@ -353,6 +350,11 @@ static StringID GenerateStationName(Station *st, TileIndex tile, StationNaming n
if (extra_name) return STR_SV_STNAME_FALLBACK;
}
/* check close enough to town to get central as name? */
if (is_central && HasBit(free_names, M(STR_SV_STNAME_CENTRAL))) {
return STR_SV_STNAME_CENTRAL;
}
/* Check lakeside */
if (HasBit(free_names, M(STR_SV_STNAME_LAKESIDE)) &&
DistanceFromEdge(tile) < 20 &&