Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h
This commit is contained in:
Jonathan G Rennison
2021-11-02 19:23:24 +00:00
99 changed files with 1632 additions and 1336 deletions

View File

@@ -927,6 +927,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. */
btree::btree_set<StationID> seen_stations;