(svn r13464) -Codechange: support NewGRF Action 0x05, type 12.

src/yapf/follow_track.hpp

@@ -264,7 +264,7 @@ protected:
 		}
 
 		// tunnel holes and bridge ramps can be entered only from proper direction
-		if (!IsWaterTT() && IsTileType(m_new_tile, MP_TUNNELBRIDGE)) {
+		if (IsTileType(m_new_tile, MP_TUNNELBRIDGE)) {
 			if (IsTunnel(m_new_tile)) {
 				if (!m_is_tunnel) {
 					DiagDirection tunnel_enterdir = GetTunnelBridgeDirection(m_new_tile);

src/yapf/yapf_ship.cpp

@@ -109,6 +109,9 @@ public:
 			/* new trackdir does not match the next one when going straight */
 			c += 10;
 		}
+
+		c += YAPF_TILE_LENGTH * tf->m_tiles_skipped;
+
 		// apply it
 		n.m_cost = n.m_parent->m_cost + c;
 		return true;