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

Relax constraints on tile behind overtaking vehicle

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-10-27 23:35:32 +00:00
parent b0dbcf33c1
commit 77c14c2f1e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/roadveh_cmd.cpp
View File

@@ -1010,9 +1010,14 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u)
check_tile = v->tile - check_tile_diff; check_tile = v->tile - check_tile_diff;
for (; tile_count != 0; tile_count--, check_tile -= check_tile_diff) { for (; tile_count != 0; tile_count--, check_tile -= check_tile_diff) {
od.tile = check_tile; od.tile = check_tile;
if (tile_count == 1) {
RoadBits rb = GetAnyRoadBits(check_tile, RTT_ROAD);
if ((rb & DiagDirToRoadBits(dir)) && HasVehicleOnPos(check_tile, VEH_ROAD, &od, EnumFindVehBlockingOvertakeBehind)) return;
} else {
if (CheckRoadInfraUnsuitableForOvertaking(&od)) return; if (CheckRoadInfraUnsuitableForOvertaking(&od)) return;
if (CheckRoadBlockedForOvertaking(&od)) return; if (CheckRoadBlockedForOvertaking(&od)) return;
} }
}
/* When the vehicle in front of us is stopped we may only take /* When the vehicle in front of us is stopped we may only take
* half the time to pass it than when the vehicle is moving. */ * half the time to pass it than when the vehicle is moving. */