--- a/bin/ai/regression/regression.nut	Mon Mar 31 06:45:57 2008 +0000
+++ b/bin/ai/regression/regression.nut	Mon Mar 31 06:48:59 2008 +0000
@@ -538,8 +538,8 @@
 	print("  IsValidTile(-1):  " + AIMap.IsValidTile(-1));
 	print("  IsValidTile():    " + AIMap.IsValidTile(AIMap.GetMapSize()));
 	print("  IsValidTile():    " + AIMap.IsValidTile(AIMap.GetMapSize() - AIMap.GetMapSizeX() - 2));
-	print("  DemolishTile():   " + AIMap.DemolishTile(19592));
-	print("  DemolishTile():   " + AIMap.DemolishTile(19335));
+	print("  DemolishTile():   " + AITile.DemolishTile(19592));
+	print("  DemolishTile():   " + AITile.DemolishTile(19335));
 	print("  Distance");
 	print("    DistanceManhattan(): " + AIMap.DistanceManhattan(1, 10000));
 	print("    DistanceMax():       " + AIMap.DistanceMax(1, 10000));

--- a/src/ai/api/ai_map.cpp	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_map.cpp	Mon Mar 31 06:48:59 2008 +0000
@@ -61,8 +61,3 @@
 {
 	return ::DistanceFromEdge(t);
 }
-
-/* static */ bool AIMap::DemolishTile(TileIndex t)
-{
-	return AIObject::DoCommand(t, 0, 0, CMD_LANDSCAPE_CLEAR);
-}

--- a/src/ai/api/ai_map.hpp	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_map.hpp	Mon Mar 31 06:48:59 2008 +0000
@@ -112,14 +112,6 @@
 	 * @return the distances to the closest edge.
 	 */
 	static uint32 DistanceFromEdge(TileIndex t);
-
-	/**
-	 * Destroy everything on the given tile.
-	 * @param t the tile to destroy the stuff of.
-	 * @pre t has to be valid (use IsValidTile(t)).
-	 * @return true if and only if the destruction succeeded
-	 */
-	static bool DemolishTile(TileIndex t);
 };
 
 #endif /* AI_MAP_HPP */

--- a/src/ai/api/ai_map.hpp.sq	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_map.hpp.sq	Mon Mar 31 06:48:59 2008 +0000
@@ -26,7 +26,6 @@
 	SQAIMap.DefSQStaticMethod(engine, &AIMap::DistanceMax,       "DistanceMax",       3, "xii");
 	SQAIMap.DefSQStaticMethod(engine, &AIMap::DistanceSquare,    "DistanceSquare",    3, "xii");
 	SQAIMap.DefSQStaticMethod(engine, &AIMap::DistanceFromEdge,  "DistanceFromEdge",  2, "xi");
-	SQAIMap.DefSQStaticMethod(engine, &AIMap::DemolishTile,      "DemolishTile",      2, "xi");
 
 	SQAIMap.PostRegister(engine);
 }

--- a/src/ai/api/ai_tile.cpp	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_tile.cpp	Mon Mar 31 06:48:59 2008 +0000
@@ -87,6 +87,16 @@
 	return produced[cargo_type];
 }
 
+/* static */ int32 AITile::GetDistanceManhattanToTile(TileIndex tile_from, TileIndex tile_to)
+{
+	return AIMap::DistanceManhattan(tile_from, tile_to);
+}
+
+/* static */ int32 AITile::GetDistanceSquareToTile(TileIndex tile_from, TileIndex tile_to)
+{
+	return AIMap::DistanceSquare(tile_from, tile_to);
+}
+
 /* static */ bool AITile::RaiseTile(TileIndex tile, int32 slope)
 {
 	if (!::IsValidTile(tile)) return false;
@@ -101,12 +111,7 @@
 	return AIObject::DoCommand(tile, slope, 0, CMD_TERRAFORM_LAND);
 }
 
-/* static */ int32 AITile::GetDistanceManhattanToTile(TileIndex tile_from, TileIndex tile_to)
+/* static */ bool AITile::DemolishTile(TileIndex t)
 {
-	return AIMap::DistanceManhattan(tile_from, tile_to);
+	return AIObject::DoCommand(t, 0, 0, CMD_LANDSCAPE_CLEAR);
 }
-
-/* static */ int32 AITile::GetDistanceSquareToTile(TileIndex tile_from, TileIndex tile_to)
-{
-	return AIMap::DistanceSquare(tile_from, tile_to);
-}

--- a/src/ai/api/ai_tile.hpp	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_tile.hpp	Mon Mar 31 06:48:59 2008 +0000
@@ -155,6 +155,13 @@
 	 */
 	static bool LowerTile(TileIndex tile, int32 slope);
 
+	/**
+	 * Destroy everything on the given tile.
+	 * @param tile the tile to demolish.
+	 * @pre AIMap::IsValidTile(tile).
+	 * @return true if and only if the tile was demolished.
+	 */
+	static bool DemolishTile(TileIndex tile);
 };
 
 #endif /* AI_TILE_HPP */

--- a/src/ai/api/ai_tile.hpp.sq	Mon Mar 31 06:45:57 2008 +0000
+++ b/src/ai/api/ai_tile.hpp.sq	Mon Mar 31 06:48:59 2008 +0000
@@ -52,6 +52,7 @@
 	SQAITile.DefSQStaticMethod(engine, &AITile::GetDistanceSquareToTile,    "GetDistanceSquareToTile",    3, "xii");
 	SQAITile.DefSQStaticMethod(engine, &AITile::RaiseTile,                  "RaiseTile",                  3, "xii");
 	SQAITile.DefSQStaticMethod(engine, &AITile::LowerTile,                  "LowerTile",                  3, "xii");
+	SQAITile.DefSQStaticMethod(engine, &AITile::DemolishTile,               "DemolishTile",               2, "xi");
 
 	SQAITile.PostRegister(engine);
 }