From 45b95ed62950678b677c555cec558b009e0b8d3e Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sun, 21 Aug 2011 14:13:22 +0000 Subject: (svn r22801) -Feature: [YAPF] Take canal/ocean speed fraction of ships into account. --- src/pathfinder/yapf/yapf_ship.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/pathfinder/yapf') diff --git a/src/pathfinder/yapf/yapf_ship.cpp b/src/pathfinder/yapf/yapf_ship.cpp index 69f1ce2c5..46b3e9bf7 100644 --- a/src/pathfinder/yapf/yapf_ship.cpp +++ b/src/pathfinder/yapf/yapf_ship.cpp @@ -133,8 +133,14 @@ public: c += YAPF_TILE_LENGTH; } + /* Skipped tile cost for aqueducts. */ c += YAPF_TILE_LENGTH * tf->m_tiles_skipped; + /* Ocean/canal speed penalty. */ + const ShipVehicleInfo *svi = ShipVehInfo(Yapf().GetVehicle()->engine_type); + byte speed_frac = (GetEffectiveWaterClass(n.GetTile()) == WATER_CLASS_SEA) ? svi->ocean_speed_frac : svi->canal_speed_frac; + if (speed_frac > 0) c += YAPF_TILE_LENGTH * (1 + tf->m_tiles_skipped) * speed_frac / (256 - speed_frac); + /* apply it */ n.m_cost = n.m_parent->m_cost + c; return true; -- cgit v1.2.3-54-g00ecf