cpp/openttd-patchpack/source Changeset - r27696:9ef479faae5f

Changeset - r27696:9ef479faae5f

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Koen Bussemaker - 11 months ago 2023-06-30 19:17:26
koen_bussemaker@hotmail.com

Change: Autorail / autoroad tools can start dragging from invalid tiles

2 files changed with 4 insertions and 4 deletions:

src/rail_cmd.cpp

src/road_cmd.cpp

0 comments (0 inline, 0 general)

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -875,8 +875,8 @@ static CommandCost ValidateAutoDrag(Trac @@
  * @param railtype railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev), only used for building
  * @param track track-orientation
  * @param remove remove tracks?
  * @param auto_remove_signals false = build up to an obstacle, true = fail if an obstacle is found (used for AIs), only used for building
  * @param fail_on_obstacle false = error on signal in the way, true = auto remove signals when in the way, only used for building
  * @param auto_remove_signals false = error on signal in the way, true = auto remove signals when in the way, only used for building
  * @param fail_on_obstacle false = build starting from and up to an obstacle, true = fail if an obstacle is found (used for AIs)
  * @return the cost of this operation or an error
  */
 static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, RailType railtype, Track track, bool remove, bool auto_remove_signals, bool fail_on_obstacle)
@@ @@ -900,7 +900,7 @@ static CommandCost CmdRailTrackHelper(Do @@
 			last_error = ret;
 			if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
 				if (fail_on_obstacle) return last_error;
 				break;
+				if (had_success) break; // Keep going if we haven't constructed any rail yet, skipping the start of the drag
+			}
 			/* Ownership errors are more important. */

src/road_cmd.cpp

➞

Show inline comments

@@ @@ -1034,7 +1034,7 @@ CommandCost CmdBuildLongRoad(DoCommandFl @@
 			last_error = ret;
 			if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT) {
 				if (is_ai) return last_error;
 				break;
+				if (had_success) break; // Keep going if we haven't constructed any road yet, skipping the start of the drag
+			}
 		} else {
 			had_success = true;

0 comments (0 inline, 0 general)