diff options
| author | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-09-26 18:41:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 18:41:41 +0200 |
| commit | 11dece205c83b530d7ddaa1290efde04f4dfdeb9 (patch) | |
| tree | d070931110f051e2e7703c1bfe08249973770bba /src | |
| parent | 14ad42447003550a985e7886606d165408c43c53 (diff) | |
| download | openttd-11dece205c83b530d7ddaa1290efde04f4dfdeb9.tar.xz | |
Revert 7ca1793: Using Trackdir keyed node is not required, Exitdir keyed node still have the correct trackdir (#9576)
Diffstat (limited to 'src')
| -rw-r--r-- | src/pathfinder/yapf/yapf_ship.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp index d47afe5df..3a54ddb3e 100644 --- a/src/pathfinder/yapf/yapf_ship.cpp +++ b/src/pathfinder/yapf/yapf_ship.cpp @@ -337,16 +337,6 @@ struct CYapfShip1 : CYapfT<CYapfShip_TypesT<CYapfShip1, CFollowTrackWater , C /* YAPF type 2 - uses TileIndex/DiagDirection as Node key */ struct CYapfShip2 : CYapfT<CYapfShip_TypesT<CYapfShip2, CFollowTrackWater , CShipNodeListExitDir > > {}; -static inline bool RequireTrackdirKey() -{ - /* If the two curve penalties are not equal, then it is not possible to use the - * ExitDir keyed node list, as it there will be key overlap. Using Trackdir keyed - * nodes means potentially more paths are tested, which would be wasteful if it's - * not necessary. - */ - return _settings_game.pf.yapf.ship_curve45_penalty != _settings_game.pf.yapf.ship_curve90_penalty; -} - /** Ship controller helper - path finder invoker */ Track YapfShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, ShipPathCache &path_cache) { @@ -355,7 +345,7 @@ Track YapfShipChooseTrack(const Ship *v, TileIndex tile, DiagDirection enterdir, PfnChooseShipTrack pfnChooseShipTrack = CYapfShip2::ChooseShipTrack; // default: ExitDir /* check if non-default YAPF type needed */ - if (_settings_game.pf.yapf.disable_node_optimization || RequireTrackdirKey()) { + if (_settings_game.pf.yapf.disable_node_optimization) { pfnChooseShipTrack = &CYapfShip1::ChooseShipTrack; // Trackdir } @@ -373,7 +363,7 @@ bool YapfShipCheckReverse(const Ship *v) PfnCheckReverseShip pfnCheckReverseShip = CYapfShip2::CheckShipReverse; // default: ExitDir /* check if non-default YAPF type needed */ - if (_settings_game.pf.yapf.disable_node_optimization || RequireTrackdirKey()) { + if (_settings_game.pf.yapf.disable_node_optimization) { pfnCheckReverseShip = &CYapfShip1::CheckShipReverse; // Trackdir } |