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

Fix #7226: Don't call ship pathfinders if there is no available track due to "forbid 90 deg turns".

pull/7246/head
J0an Josep 2019-02-14 19:07:06 +01:00 committed by Michael Lutz
parent 349cbee6e9
commit 6ca637b8c1
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ship_cmd.cpp
View File

@ -510,9 +510,20 @@ static Track ChooseShipTrack(Ship *v, TileIndex tile, DiagDirection enterdir, Tr
return track; return track;
} }
static inline TrackBits GetAvailShipTracks(TileIndex tile, DiagDirection dir) /**
* Get the available water tracks on a tile for a ship entering a tile.
* @param tile The tile about to enter.
* @param dir The entry direction.
* @param trackdir The trackdir the ship has on the old tile.
* @return The available trackbits on the next tile.
*/
static inline TrackBits GetAvailShipTracks(TileIndex tile, DiagDirection dir, Trackdir trackdir)
{ {
return GetTileShipTrackStatus(tile) & DiagdirReachesTracks(dir); TrackBits tracks = GetTileShipTrackStatus(tile) & DiagdirReachesTracks(dir);
if (_settings_game.pf.forbid_90_deg) tracks &= ~TrackCrossesTracks(TrackdirToTrack(trackdir));
return tracks;
} }
static const byte _ship_subcoord[4][6][3] = { static const byte _ship_subcoord[4][6][3] = {
@ -699,7 +710,7 @@ static void ShipController(Ship *v)
DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile); DiagDirection diagdir = DiagdirBetweenTiles(gp.old_tile, gp.new_tile);
assert(diagdir != INVALID_DIAGDIR); assert(diagdir != INVALID_DIAGDIR);
tracks = GetAvailShipTracks(gp.new_tile, diagdir); tracks = GetAvailShipTracks(gp.new_tile, diagdir, v->GetVehicleTrackdir());
if (tracks == TRACK_BIT_NONE) goto reverse_direction; if (tracks == TRACK_BIT_NONE) goto reverse_direction;
/* Choose a direction, and continue if we find one */ /* Choose a direction, and continue if we find one */