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

Allow RV overtaking when another vehicle is on the same tile behind it

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-10-24 14:48:02 +01:00
parent 755fa8196f
commit 5f4541768a
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/roadveh_cmd.cpp
View File

@@ -825,7 +825,27 @@ static Vehicle *EnumFindVehBlockingOvertake(Vehicle *v, void *data)
{
const OvertakeData *od = (OvertakeData*)data;
return (v->First() == v && v != od->u && v != od->v) ? v : nullptr;
if (v->First() == od->u || v->First() == od->v) return nullptr;
if (RoadVehicle::From(v)->overtaking != 0 || v->direction != od->v->direction) return v;
/* Check if other vehicle is behind */
switch (DirToDiagDir(v->direction)) {
case DIAGDIR_NE:
if (v->x_pos > od->v->x_pos) return nullptr;
break;
case DIAGDIR_SE:
if (v->y_pos < od->v->y_pos) return nullptr;
break;
case DIAGDIR_SW:
if (v->x_pos < od->v->x_pos) return nullptr;
break;
case DIAGDIR_NW:
if (v->y_pos > od->v->y_pos) return nullptr;
break;
default:
NOT_REACHED();
}
return v;
}
/**