From bb28ff7226938f0882b67e2cffa0126ae26a5b5d Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 5 Jan 2021 12:36:57 +0100 Subject: Codechange: DC_NO_RAIL_OVERLAP is a remnant of the OldAI. (#8496) The OldAI was removed in 2009. Pretty sure we can remove this flag now too. --- src/rail_cmd.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/rail_cmd.cpp') diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index a71441532..34ad07d52 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -263,12 +263,8 @@ static CommandCost CheckTrackCombination(TileIndex tile, TrackBits to_build, uin } /* Let's see if we may build this */ - if ((flags & DC_NO_RAIL_OVERLAP) || HasSignals(tile)) { - /* 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((flags & DC_NO_RAIL_OVERLAP) ? STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION : STR_ERROR_MUST_REMOVE_SIGNALS_FIRST); - } + if (HasSignals(tile) && future != TRACK_BIT_HORZ && future != TRACK_BIT_VERT) { + return_cmd_error(STR_ERROR_MUST_REMOVE_SIGNALS_FIRST); } /* Normally, we may overlap and any combination is valid */ return CommandCost(); -- cgit v1.2.3-54-g00ecf