diff -r ed8f92929297 -r dc85aaa556ae src/water_cmd.cpp
--- a/src/water_cmd.cpp	Fri Mar 23 12:03:41 2007 +0000
+++ b/src/water_cmd.cpp	Sat Mar 31 12:34:36 2007 +0000
@@ -92,7 +92,7 @@
 		MarkTileDirtyByTile(tile2);
 	}
 
-	return cost + _price.build_ship_depot;
+	return cost + _eco->GetPrice(CEconomy::BUILD_SHIP_DEPOT);
 }
 
 static int32 RemoveShipDepot(TileIndex tile, uint32 flags)
@@ -117,7 +117,7 @@
 		MarkTileDirtyByTile(tile2);
 	}
 
-	return _price.remove_ship_depot;
+	return _eco->GetPrice(CEconomy::REMOVE_SHIP_DEPOT);
 }
 
 // build a shiplift
@@ -158,7 +158,7 @@
 		MarkTileDirtyByTile(tile + delta);
 	}
 
-	return _price.clear_water * 22 >> 3;
+	return _eco->GetPrice(CEconomy::CLEAR_WATER) * 22 >> 3;
 }
 
 static int32 RemoveShiplift(TileIndex tile, uint32 flags)
@@ -177,7 +177,7 @@
 		DoClearSquare(tile - delta);
 	}
 
-	return _price.clear_water * 2;
+	return _eco->GetPrice(CEconomy::CLEAR_WATER) * 2;
 }
 
 static void MarkTilesAroundDirty(TileIndex tile)
@@ -266,7 +266,7 @@
 			MarkTilesAroundDirty(tile);
 		}
 
-		cost += _price.clear_water;
+		cost += _eco->GetPrice(CEconomy::CLEAR_WATER);
 	} END_TILE_LOOP(tile, size_x, size_y, 0);
 
 	if (cost == 0) {
@@ -294,7 +294,7 @@
 			if (GetTileOwner(tile) != OWNER_WATER && !CheckTileOwnership(tile)) return CMD_ERROR;
 
 			if (flags & DC_EXEC) DoClearSquare(tile);
-			return _price.clear_water;
+			return _eco->GetPrice(CEconomy::CLEAR_WATER);
 
 		case WATER_TILE_COAST: {
 			Slope slope = GetTileSlope(tile, NULL);
@@ -310,9 +310,9 @@
 
 			if (flags & DC_EXEC) DoClearSquare(tile);
 			if (slope == SLOPE_N || slope == SLOPE_E || slope == SLOPE_S || slope == SLOPE_W) {
-				return _price.clear_water;
+				return _eco->GetPrice(CEconomy::CLEAR_WATER);
 			} else {
-				return _price.purchase_land;
+				return _eco->GetPrice(CEconomy::PURCHASE_LAND);
 			}
 		}