cpp/openttd-patchpack/source Changeset - r24663:f0be137d754b

Changeset - r24663:f0be137d754b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx22 - 4 years ago 2021-01-14 17:41:38
glx22@users.noreply.github.com

Fix #7670: prevent useless pathfinder run for blocked vehicles

1 file changed with 10 insertions and 1 deletions:

src/roadveh_cmd.cpp

0 comments (0 inline, 0 general)

src/roadveh_cmd.cpp

➞

Show inline comments

@@ @@ -1389,7 +1389,16 @@ again: @@
 		int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y;
 		Direction new_dir = RoadVehGetSlidingDirection(v, x, y);
 		if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) return false;
 		if (v->IsFrontEngine() && RoadVehFindCloseTo(v, x, y, new_dir) != nullptr) {
 			/* We are blocked. */
 			v->cur_speed = 0;
 			if (!v->path.empty()) {
 				/* Prevent pathfinding rerun as we already know where we are heading to. */
 				v->path.tile.push_front(v->tile);
 				v->path.td.push_front(dir);
+			}
 			return false;
+		}
 		uint32 r = VehicleEnterTile(v, v->tile, x, y);
 		if (HasBit(r, VETS_CANNOT_ENTER)) {

0 comments (0 inline, 0 general)