mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-16 08:52:40 +01:00
Code Issues Releases Wiki Activity

Remove: Hidden setting for adjacent stations (#12862)

Browse Source
This commit is contained in:
Tyler Trahan
2024-11-06 14:11:07 -05:00
committed by GitHub
parent 5d7a7b2955
commit c3bb512bd9
5 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/station_gui.cpp
View File

@@ -2455,11 +2455,7 @@ static bool StationJoinerNeeded(TileArea ta, const StationPickerCmdProc &proc)
/* Now check if we could build there */
if (!proc(true, INVALID_STATION)) return false;
/* Test for adjacent station or station below selection.
* If adjacent-stations is disabled and we are building next to a station, do not show the selection window.
* but join the other station immediately. */
const BaseStation *st = FindStationsNearby<T>(ta, false);
return st == nullptr && (_settings_game.station.adjacent_stations || std::any_of(std::begin(_stations_nearby_list), std::end(_stations_nearby_list), [](StationID s) { return s != NEW_STATION; }));
return FindStationsNearby<T>(ta, false) == nullptr;
}
/**