mirror of https://github.com/OpenTTD/OpenTTD
(svn r7127) -Codechange [FS#149]: Improve the usability of the signal-dragger, do not bail out
at (certain) errors, just silently ignore them.release/0.5
parent
d0e0b78a32
commit
0d9f80839f
|
@ -795,12 +795,8 @@ static int32 CmdSignalTrackHelper(TileIndex tile, uint32 flags, uint32 p1, uint3
|
||||||
if (signal_ctr % signal_density == 0) {
|
if (signal_ctr % signal_density == 0) {
|
||||||
ret = DoCommand(tile, TrackdirToTrack(trackdir) | semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS);
|
ret = DoCommand(tile, TrackdirToTrack(trackdir) | semaphores, signals, flags, (mode == 1) ? CMD_REMOVE_SIGNALS : CMD_BUILD_SIGNALS);
|
||||||
|
|
||||||
/* Abort placement for any other error than NOT_SUITABLE_TRACK
|
/* Be user-friendly and try placing signals as much as possible */
|
||||||
* This includes vehicles on track, competitor's tracks, etc. */
|
if (!CmdFailed(ret)) {
|
||||||
if (CmdFailed(ret)) {
|
|
||||||
if (_error_message != STR_1005_NO_SUITABLE_RAILROAD_TRACK && mode != 1) return CMD_ERROR;
|
|
||||||
_error_message = INVALID_STRING_ID;
|
|
||||||
} else {
|
|
||||||
error = false;
|
error = false;
|
||||||
total_cost += ret;
|
total_cost += ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue