dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix auto remove signals functionality

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-01-31 01:41:05 +00:00
parent 082d9021d0
commit 1d1b105299
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/rail_cmd.cpp
View File

@@ -270,7 +270,7 @@ static CommandCost EnsureNoTrainOnTrack(TileIndex tile, Track track)
* @param flags Flags of the operation. * @param flags Flags of the operation.
* @return Succeeded or failed command. * @return Succeeded or failed command.
*/ */
static CommandCost CheckTrackCombination(TileIndex tile, TrackBits to_build, RailType railtype, bool disable_dual_rail_type, DoCommandFlag flags) static CommandCost CheckTrackCombination(TileIndex tile, TrackBits to_build, RailType railtype, bool disable_dual_rail_type, DoCommandFlag flags, bool auto_remove_signals)
{ {
if (!IsPlainRail(tile)) return_cmd_error(STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION); if (!IsPlainRail(tile)) return_cmd_error(STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION);
@@ -303,6 +303,15 @@ static CommandCost CheckTrackCombination(TileIndex tile, TrackBits to_build, Rai
return CommandCost(); return CommandCost();
} }
/* Let's see if we may build this */
if (HasSignals(tile) && !auto_remove_signals) {
/* If we are not allowed to overlap (flag is on for ai companies or we have
* signals on the tile), check that */
if (future != TRACK_BIT_HORZ && future != TRACK_BIT_VERT) {
return_cmd_error(STR_ERROR_MUST_REMOVE_SIGNALS_FIRST);
}
}
RailType rt = INVALID_RAILTYPE; RailType rt = INVALID_RAILTYPE;
if (current == TRACK_BIT_HORZ || current == TRACK_BIT_VERT) { if (current == TRACK_BIT_HORZ || current == TRACK_BIT_VERT) {
RailType rt1 = GetRailType(tile); RailType rt1 = GetRailType(tile);
@@ -359,10 +368,6 @@ static CommandCost CheckTrackCombination(TileIndex tile, TrackBits to_build, Rai
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
} }
if (HasSignalOnTrack(tile, TRACK_UPPER) || HasSignalOnTrack(tile, TRACK_LOWER)) {
return_cmd_error(STR_ERROR_MUST_REMOVE_SIGNALS_FIRST);
}
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
SetRailType(tile, railtype); SetRailType(tile, railtype);
SetSecondaryRailType(tile, railtype); SetSecondaryRailType(tile, railtype);
@@ -590,7 +595,7 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u
} }
}); });
ret = CheckTrackCombination(tile, trackbit, railtype, disable_dual_rail_type, flags); ret = CheckTrackCombination(tile, trackbit, railtype, disable_dual_rail_type, flags, auto_remove_signals);
if (ret.Succeeded()) { if (ret.Succeeded()) {
cost.AddCost(ret); cost.AddCost(ret);
ret = EnsureNoTrainOnTrack(tile, track); ret = EnsureNoTrainOnTrack(tile, track);