diff -r 1bacf27342bd -r 495789401303 src/ai/api/ai_road.cpp
--- a/src/ai/api/ai_road.cpp	Thu May 22 10:23:34 2008 +0000
+++ b/src/ai/api/ai_road.cpp	Thu May 22 15:49:08 2008 +0000
@@ -3,10 +3,12 @@
 /** @file ai_road.cpp Implementation of AIRoad. */
 
 #include "ai_road.hpp"
+#include "ai_map.hpp"
 #include "../../openttd.h"
 #include "../../road_map.h"
 #include "../../station_map.h"
 #include "../../command_type.h"
+#include "../../player_func.h"
 
 /* static */ bool AIRoad::IsRoadTile(TileIndex tile)
 {
@@ -37,6 +39,30 @@
 	return ::IsDriveThroughStopTile(tile);
 }
 
+/* static */ bool AIRoad::IsRoadTypeAvailable(RoadType road_type)
+{
+	return ::HasRoadTypesAvail(_current_player, ::RoadTypeToRoadTypes((::RoadType)road_type));
+}
+
+/* static */ AIRoad::RoadType AIRoad::GetCurrentRoadType()
+{
+	return (RoadType)AIObject::GetRoadType();
+}
+
+/* static */ void AIRoad::SetCurrentRoadType(RoadType road_type)
+{
+	if (!IsRoadTypeAvailable(road_type)) return;
+
+	AIObject::SetRoadType((::RoadType)road_type);
+}
+
+/* static */ bool AIRoad::HasRoadType(TileIndex tile, RoadType road_type)
+{
+	if (!AIMap::IsValidTile(tile)) return false;
+	if (!IsRoadTypeAvailable(road_type)) return false;
+	return ::GetAnyRoadBits(tile, (::RoadType)road_type, false) != ROAD_NONE;
+}
+
 /* static */ bool AIRoad::AreRoadTilesConnected(TileIndex t1, TileIndex t2)
 {
 	if (!::IsValidTile(t1)) return false;
@@ -45,8 +71,8 @@
 	/* Tiles not neighbouring */
 	if ((abs((int)::TileX(t1) - (int)::TileX(t2)) + abs((int)::TileY(t1) - (int)::TileY(t2))) != 1) return false;
 
-	RoadBits r1 = ::GetAnyRoadBits(t1, ROADTYPE_ROAD);
-	RoadBits r2 = ::GetAnyRoadBits(t2, ROADTYPE_ROAD);
+	RoadBits r1 = ::GetAnyRoadBits(t1, AIObject::GetRoadType());
+	RoadBits r2 = ::GetAnyRoadBits(t2, AIObject::GetRoadType());
 
 	DiagDirection dir_1 = (DiagDirection)((::TileX(t1) == ::TileX(t2)) ? (::TileY(t1) < ::TileY(t2) ? 2 : 0) : (::TileX(t1) < ::TileX(t2) ? 1 : 3));
 	DiagDirection dir_2 = ::ReverseDiagDir(dir_1);
@@ -96,7 +122,7 @@
 	EnforcePrecondition(false, ::IsValidTile(end));
 	EnforcePrecondition(false, TileX(start) == TileX(end) || TileY(start) == TileY(end));
 
-	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (ROADTYPE_ROAD << 3), CMD_BUILD_LONG_ROAD);
+	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_BUILD_LONG_ROAD);
 }
 
 /* static */ bool AIRoad::BuildRoadFull(TileIndex start, TileIndex end)
@@ -106,7 +132,7 @@
 	EnforcePrecondition(false, ::IsValidTile(end));
 	EnforcePrecondition(false, TileX(start) == TileX(end) || TileY(start) == TileY(end));
 
-	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 2 : 1), CMD_BUILD_LONG_ROAD);
+	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_BUILD_LONG_ROAD);
 }
 
 /* static */ bool AIRoad::BuildRoadDepot(TileIndex tile, TileIndex front)
@@ -117,7 +143,7 @@
 
 	uint entrance_dir = (TileX(tile) == TileX(front)) ? (TileY(tile) < TileY(front) ? 1 : 3) : (TileX(tile) < TileX(front) ? 2 : 0);
 
-	return AIObject::DoCommand(tile, entrance_dir, ROADTYPE_ROAD << 2, CMD_BUILD_ROAD_DEPOT);
+	return AIObject::DoCommand(tile, entrance_dir, AIObject::GetRoadType() << 2, CMD_BUILD_ROAD_DEPOT);
 }
 
 /* static */ bool AIRoad::BuildRoadStation(TileIndex tile, TileIndex front, bool truck, bool drive_through)
@@ -133,7 +159,7 @@
 		entrance_dir = (TileX(tile) == TileX(front)) ? (TileY(tile) < TileY(front) ? 1 : 3) : (TileX(tile) < TileX(front) ? 2 : 0);
 	}
 
-	return AIObject::DoCommand(tile, entrance_dir, (drive_through ? 2 : 0) | (truck ? 1 : 0) | (ROADTYPES_ROAD << 2), CMD_BUILD_ROAD_STOP);
+	return AIObject::DoCommand(tile, entrance_dir, (drive_through ? 2 : 0) | (truck ? 1 : 0) | (::RoadTypeToRoadTypes(AIObject::GetRoadType()) << 2), CMD_BUILD_ROAD_STOP);
 }
 
 /* static */ bool AIRoad::RemoveRoad(TileIndex start, TileIndex end)
@@ -142,7 +168,7 @@
 	EnforcePrecondition(false, ::IsValidTile(end));
 	EnforcePrecondition(false, TileX(start) == TileX(end) || TileY(start) == TileY(end));
 
-	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (ROADTYPE_ROAD << 3), CMD_REMOVE_LONG_ROAD);
+	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
 }
 
 /* static */ bool AIRoad::RemoveRoadFull(TileIndex start, TileIndex end)
@@ -151,7 +177,7 @@
 	EnforcePrecondition(false, ::IsValidTile(end));
 	EnforcePrecondition(false, TileX(start) == TileX(end) || TileY(start) == TileY(end));
 
-	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 2 : 1), CMD_REMOVE_LONG_ROAD);
+	return AIObject::DoCommand(end, start, (TileY(start) != TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD);
 }
 
 /* static */ bool AIRoad::RemoveRoadDepot(TileIndex tile)