gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-24 22:19:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15069) -Change (r14919): Make distant-join less intelligent but more transparent to the user by always showing the selection window, even if there is only one option to choose from. (PhilSophus)

Browse Source
This commit is contained in:
frosch 2009-01-13 18:41:56 +00:00
parent 2e30efb530
commit 9ca1e15f51
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/station_gui.cpp
View File

@ -1226,16 +1226,11 @@ static bool StationJoinerNeeded(CommandContainer cmd, int w, int h)
/* Now check if we could build there */
if (CmdFailed(DoCommand(&cmd, CommandFlagsToDCFlags(GetCommandFlags(cmd.cmd))))) return false;
/* First test for adjacent station */
FindStationsNearby(cmd.tile, w, h, false);
int neighbour_station_count = _stations_nearby_list.Length();
/* Now test for stations fully within station spread */
const Station *st = FindStationsNearby(cmd.tile, w, h, true);
if (_settings_game.station.adjacent_stations) {
return (neighbour_station_count == 0 || _stations_nearby_list.Length() > 1) && st == NULL;
} else {
return neighbour_station_count == 0 && _stations_nearby_list.Length() > 0 && st == NULL;
}
/* 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 immediatelly. */
const Station *st = FindStationsNearby(cmd.tile, w, h, false);
return st == NULL && (_settings_game.station.adjacent_stations || _stations_nearby_list.Length() == 0);
}
/**