Merge branch 'master' into 1.11

2021-03-24 23:07:53 +03:00
parent fdcd6d6444 6f8e0c144b
commit 1859af4a63
36 changed files with 2646 additions and 322 deletions
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -154,7 +154,7 @@ static void FindStationsAroundSelection()
 void CheckRedrawStationCoverage(const Window *w)
 {
 	/* CityMania code begin */
-	if (_settings_client.gui.cm_use_improved_station_join) {
+	if (citymania::UseImprovedStationJoin()) {
 		if (citymania::CheckRedrawStationCoverage()) w->SetDirty();
 		return;
 	}