Mercurial > hg > openttd

changeset 10736:6f72f80df252 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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)
author frosch <frosch@openttd.org>
date Tue, 13 Jan 2009 18:41:56 +0000
parents 25e151cb1f4e
children ba4341b38b88
files src/station_gui.cpp
diffstat 1 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -1226,16 +1226,11 @@
 	/* 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);
 }
 
 /**