From ca435fcece2b98d2d4e6f80df6eb1eaeb2e060dc Mon Sep 17 00:00:00 2001 From: yexo Date: Wed, 6 May 2009 21:38:59 +0000 Subject: (svn r16243) -Fix [FS#2875]: CmdBuildTunnel could be called with invalid parameters from the api code, causing crashes later --- src/ai/api/ai_tunnel.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/ai/api/ai_tunnel.cpp') diff --git a/src/ai/api/ai_tunnel.cpp b/src/ai/api/ai_tunnel.cpp index cc7d95606..ea103ce4e 100644 --- a/src/ai/api/ai_tunnel.cpp +++ b/src/ai/api/ai_tunnel.cpp @@ -23,8 +23,21 @@ /* If it's a tunnel alread, take the easy way out! */ if (IsTunnelTile(tile)) return ::GetOtherTunnelEnd(tile); - ::DoCommand(tile, 0, 0, DC_AUTO, CMD_BUILD_TUNNEL); - return _build_tunnel_endtile == 0 ? INVALID_TILE : _build_tunnel_endtile; + uint start_z; + Slope start_tileh = ::GetTileSlope(tile, &start_z); + DiagDirection direction = ::GetInclinedSlopeDirection(start_tileh); + if (direction == INVALID_DIAGDIR) return INVALID_TILE; + + TileIndexDiff delta = ::TileOffsByDiagDir(direction); + uint end_z; + do { + tile += delta; + if (!::IsValidTile(tile)) return INVALID_TILE; + + ::GetTileSlope(tile, &end_z); + } while (start_z != end_z); + + return tile; } static void _DoCommandReturnBuildTunnel2(class AIInstance *instance) -- cgit v1.2.3-54-g00ecf