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

Add a dedicated setting to enable ship collision avoidance.

Browse Source
This commit is contained in:
Jonathan G Rennison
2016-01-19 22:37:23 +00:00
parent c74a8ad557
commit b00b1125be
5 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ship_cmd.cpp
View File

@@ -620,7 +620,7 @@ static void ShipController(Ship *v)
if (track == INVALID_TRACK) goto reverse_direction;
/* Try to avoid collision and keep distance between each other. */
if (_settings_game.pf.forbid_90_deg && DistanceManhattan(v->dest_tile, gp.new_tile) > 3) {
if (_settings_game.pf.forbid_90_deg && _settings_game.vehicle.ship_collision_avoidance && DistanceManhattan(v->dest_tile, gp.new_tile) > 3) {
if (HasVehicleOnPos(gp.new_tile, NULL, &FindShipOnTile) ||
HasVehicleOnPos(TileAddByDiagDir(gp.new_tile, _diagdir_to_next_tile[track][diagdir]), NULL, &FindShipOnTile)) {