summaryrefslogtreecommitdiff
path: root/src/station_base.h
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-08-31 14:31:37 +0200
committerGitHub <noreply@github.com>2021-08-31 14:31:37 +0200
commit2c05412d722903748bf928fd201b15cdad586a94 (patch)
tree0878e1a863cb7ca20215eadee20ac0fe68c893f9 /src/station_base.h
parent69e9acd70285feacf4ab44603d4f73b1f5bd0a78 (diff)
downloadopenttd-2c05412d722903748bf928fd201b15cdad586a94.tar.xz
Fix #9407: desync when founding a town nearby a station (#9526)
"stations_near" wasn't updated when founding a town near a station. As this variable is not saved, any client joining after the town is founded has a different value for "stations_near", potentially causing desyncs. As the intention of this if() statement was to skip an expensive calculation when there are clearly no stations, better to move that check inside the function, so other places also enjoy the speedup.
Diffstat (limited to 'src/station_base.h')
-rw-r--r--src/station_base.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/station_base.h b/src/station_base.h
index c63dcade1..eff191860 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -565,6 +565,9 @@ void RebuildStationKdtree();
template<typename Func>
void ForAllStationsAroundTiles(const TileArea &ta, Func func)
{
+ /* There are no stations, so we will never find anything. */
+ if (Station::GetNumItems() == 0) return;
+
/* Not using, or don't have a nearby stations list, so we need to scan. */
std::set<StationID> seen_stations;