Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-10-31 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7670: prevent useless pathfinder run for blocked vehicles

Browse Source
This commit is contained in:
glx22 2021-01-14 18:41:38 +01:00 committed by GitHub
parent bc8f347ef2
commit 86818e5ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/roadveh_cmd.cpp
View File

@ -1389,7 +1389,16 @@ again:
int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y; int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y;
Direction new_dir = RoadVehGetSlidingDirection(v, x, 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); uint32 r = VehicleEnterTile(v, v->tile, x, y);
if (HasBit(r, VETS_CANNOT_ENTER)) { if (HasBit(r, VETS_CANNOT_ENTER)) {