From d452a0a0ecaad276c893b62ab8f008a5af85ba82 Mon Sep 17 00:00:00 2001 From: frosch Date: Sat, 21 Mar 2009 21:43:23 +0000 Subject: (svn r15789) -Codechange: Add DiagdirBetweenTiles() and use it. --- src/ai/api/ai_tunnel.cpp | 4 ++-- 1 file changed, 2 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 2b1fb1e31..cc7d95606 100644 --- a/src/ai/api/ai_tunnel.cpp +++ b/src/ai/api/ai_tunnel.cpp @@ -86,7 +86,7 @@ static void _DoCommandReturnBuildTunnel1(class AIInstance *instance) TileIndex end = AIObject::GetCallbackVariable(0); TileIndex start = AITunnel::GetOtherTunnelEnd(end); - DiagDirection dir_1 = (DiagDirection)((::TileX(start) == ::TileX(end)) ? (::TileY(start) < ::TileY(end) ? DIAGDIR_NW : DIAGDIR_SE) : (::TileX(start) < ::TileX(end) ? DIAGDIR_NE : DIAGDIR_SW)); + DiagDirection dir_1 = ::DiagdirBetweenTiles(end, start); DiagDirection dir_2 = ::ReverseDiagDir(dir_1); if (!AIObject::DoCommand(start + ::TileOffsByDiagDir(dir_1), ::DiagDirToRoadBits(dir_2) | (AIObject::GetRoadType() << 4), 0, CMD_BUILD_ROAD, NULL, &_DoCommandReturnBuildTunnel2)) return false; @@ -101,7 +101,7 @@ static void _DoCommandReturnBuildTunnel1(class AIInstance *instance) TileIndex end = AIObject::GetCallbackVariable(0); TileIndex start = AITunnel::GetOtherTunnelEnd(end); - DiagDirection dir_1 = (DiagDirection)((::TileX(start) == ::TileX(end)) ? (::TileY(start) < ::TileY(end) ? DIAGDIR_NW : DIAGDIR_SE) : (::TileX(start) < ::TileX(end) ? DIAGDIR_NE : DIAGDIR_SW)); + DiagDirection dir_1 = ::DiagdirBetweenTiles(end, start); DiagDirection dir_2 = ::ReverseDiagDir(dir_1); return AIObject::DoCommand(end + ::TileOffsByDiagDir(dir_2), ::DiagDirToRoadBits(dir_1) | (AIObject::GetRoadType() << 4), 0, CMD_BUILD_ROAD); -- cgit v1.2.3-54-g00ecf