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

Fix: Road vehicle blocking and train collissions used slightly inconsistent distance thresholds.

pull/14116/head
frosch 2025-04-26 15:24:40 +02:00 committed by frosch
parent 3a70d1e2f7
commit be39a05327
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/roadveh_cmd.cpp
View File

@ -553,9 +553,8 @@ static bool RoadVehCheckTrainCrash(RoadVehicle *v)
if (!IsLevelCrossingTile(tile)) continue; if (!IsLevelCrossingTile(tile)) continue;
if (HasVehicleNearTileXY(v->x_pos, v->y_pos, 6, [&u](const Vehicle *t) { if (HasVehicleNearTileXY(v->x_pos, v->y_pos, 4, [&u](const Vehicle *t) {
return t->type == VEH_TRAIN && abs(t->z_pos - u->z_pos) <= 6 && return t->type == VEH_TRAIN && abs(t->z_pos - u->z_pos) <= 6;
abs(t->x_pos - u->x_pos) <= 4 && abs(t->y_pos - u->y_pos) <= 4;
})) { })) {
RoadVehCrash(v); RoadVehCrash(v);
return true; return true;
@ -649,7 +648,7 @@ static RoadVehicle *RoadVehFindCloseTo(RoadVehicle *v, int x, int y, Direction d
FindClosestBlockingRoadVeh(u, &rvf); FindClosestBlockingRoadVeh(u, &rvf);
} }
} else { } else {
for (Vehicle *u : VehiclesNearTileXY(x, y, 6)) { for (Vehicle *u : VehiclesNearTileXY(x, y, 8)) {
FindClosestBlockingRoadVeh(u, &rvf); FindClosestBlockingRoadVeh(u, &rvf);
} }
} }

2
src/train_cmd.cpp
View File

@ -3228,7 +3228,7 @@ static bool CheckTrainCollision(Train *v)
num_victims += CheckTrainCollision(u, v); num_victims += CheckTrainCollision(u, v);
} }
} else { } else {
for (Vehicle *u : VehiclesNearTileXY(v->x_pos, v->y_pos, 6)) { for (Vehicle *u : VehiclesNearTileXY(v->x_pos, v->y_pos, 7)) {
num_victims += CheckTrainCollision(u, v); num_victims += CheckTrainCollision(u, v);
} }
} }