cpp/openttd-patchpack/source Changeset - r11849:e2bd97780f4e

Changeset - r11849:e2bd97780f4e

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

yexo - 15 years ago 2009-05-06 21:40:51
yexo@openttd.org

(svn r16244) -Fix [NoAI]: Make sure AITunnel::BuildTunnel returns what the documentation says it does

1 file changed with 3 insertions and 11 deletions:

src/ai/api/ai_tunnel.cpp

0 comments (0 inline, 0 general)

src/ai/api/ai_tunnel.cpp

➞

Show inline comments

@@ @@ -43,7 +43,6 @@ @@
 static void _DoCommandReturnBuildTunnel2(class AIInstance *instance)
+{
 	if (!AITunnel::_BuildTunnelRoad2()) {
 		AIObject::SetLastCommandRes(false);
 		AIInstance::DoCommandReturn(instance);
 		return;
+	}
@@ @@ -56,7 +55,6 @@ static void _DoCommandReturnBuildTunnel2 @@
 static void _DoCommandReturnBuildTunnel1(class AIInstance *instance)
+{
 	if (!AITunnel::_BuildTunnelRoad1()) {
 		AIObject::SetLastCommandRes(false);
 		AIInstance::DoCommandReturn(instance);
 		return;
+	}
@@ @@ -75,7 +73,7 @@ static void _DoCommandReturnBuildTunnel1 @@
 	uint type = 0;
 	if (vehicle_type == AIVehicle::VT_ROAD) {
 		type |= (TRANSPORT_ROAD << 9);
 		type |= RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType());
+		type |= ::RoadTypeToRoadTypes((::RoadType)AIObject::GetRoadType());
 	} else {
 		type |= (TRANSPORT_RAIL << 9);
 		type |= AIRail::GetCurrentRailType();
@@ @@ -87,10 +85,7 @@ static void _DoCommandReturnBuildTunnel1 @@
+	}
 	AIObject::SetCallbackVariable(0, start);
 	if (!AIObject::DoCommand(start, type, 0, CMD_BUILD_TUNNEL, NULL, &_DoCommandReturnBuildTunnel1)) return false;
 	/* In case of test-mode, test if we can build both road pieces */
 	return _BuildTunnelRoad1();
 	return AIObject::DoCommand(start, type, 0, CMD_BUILD_TUNNEL, NULL, &_DoCommandReturnBuildTunnel1);
+}
 /* static */ bool AITunnel::_BuildTunnelRoad1()
@@ @@ -102,10 +97,7 @@ static void _DoCommandReturnBuildTunnel1 @@
 	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;
 	/* In case of test-mode, test the other road piece too */
 	return _BuildTunnelRoad2();
 	return AIObject::DoCommand(start + ::TileOffsByDiagDir(dir_1), ::DiagDirToRoadBits(dir_2) | (AIObject::GetRoadType() << 4), 0, CMD_BUILD_ROAD, NULL, &_DoCommandReturnBuildTunnel2);
+}
 /* static */ bool AITunnel::_BuildTunnelRoad2()

0 comments (0 inline, 0 general)