Mercurial > hg > openttd

changeset 19453:964faafd388f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r24356) -Change: Allow building/modifying/removing signals even if a train is on the belonging track.
author frosch <frosch@openttd.org>
date Sat, 23 Jun 2012 20:18:29 +0000
parents 25abb09d38d8
children 30589fceb4e8
files src/rail_cmd.cpp
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -986,13 +986,10 @@
 			!HasTrack(tile, track)) {
 		return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK);
 	}
-	CommandCost ret = EnsureNoTrainOnTrack(tile, track);
-	if (ret.Failed()) return ret;
-
 	/* Protect against invalid signal copying */
 	if (p2 != 0 && (p2 & SignalOnTrack(track)) == 0) return CMD_ERROR;
 
-	ret = CheckTileOwnership(tile);
+	CommandCost ret = CheckTileOwnership(tile);
 	if (ret.Failed()) return ret;
 
 	{
@@ -1400,8 +1397,6 @@
 	if (!HasSignalOnTrack(tile, track)) {
 		return_cmd_error(STR_ERROR_THERE_ARE_NO_SIGNALS);
 	}
-	CommandCost ret = EnsureNoTrainOnTrack(tile, track);
-	if (ret.Failed()) return ret;
 
 	/* Only water can remove signals from anyone */
 	if (_current_company != OWNER_WATER) {