mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Cleanup #10028: Further Cleanup/Optimization

pull/10602/head
TrevorShelton 2023-04-08 16:32:54 -07:00
parent fa088b0c21
commit 52ca3f020b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/roadveh_cmd.cpp
View File

@ -790,17 +790,17 @@ static Vehicle *EnumFindVehBlockingOvertake(Vehicle *v, void *data)
/* From here, the third vehicle is blocking if one of the below is true. */
/* 1: The third vehicle is going the opposite way, so it's not wise to pass. */
bool head_on = v->direction == ReverseDir(od->v->direction);
if (v->direction == ReverseDir(od->v->direction)) return v;
/* 2: If the passee is active but not moving, then it is likely wanting to overtake as well.
* It's safer to let it deal with this first. If it is moving, it is better to close passer
* and passee's distance first than it is to try and overtake. */
bool passee_pending = !(od->u->vehstatus & VS_STOPPED);
if (!(od->u->vehstatus & VS_STOPPED)) return v;
/* 3: Third vehicle is trying to overtake too, but it is stuck for some reason. */
bool has_stuck_overtaker = ((RoadVehicle*)v)->overtaking && v->vehstatus & VS_STOPPED;
if (((RoadVehicle*)v)->overtaking && v->vehstatus & VS_STOPPED) return v;
return (head_on || passee_pending || has_stuck_overtaker) ? v : nullptr;
return nullptr;
}
/**