diff options
| author | kwolekr <kwolekr@minetest.net> | 2013-03-24 01:43:38 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2013-03-24 13:23:33 -0400 |
| commit | 57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc (patch) | |
| tree | 99b6ce58417103e4271aae2db63cce9c3d85db1d /src/mapgen_v6.cpp | |
| parent | f70378f7f57f293a2a0afcf35aec8ee67180a6c0 (diff) | |
| download | minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.tar.gz minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.tar.bz2 minetest-57cbb8bfd8daaa1b8b1aa876723ff6355d21f7fc.zip | |
Add Ore infrastructure and l_register_ore()
Diffstat (limited to 'src/mapgen_v6.cpp')
| -rw-r--r-- | src/mapgen_v6.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp index 1efa3ad74..0b419617d 100644 --- a/src/mapgen_v6.cpp +++ b/src/mapgen_v6.cpp @@ -64,9 +64,10 @@ NoiseParams nparams_v6_def_apple_trees = /////////////////////////////////////////////////////////////////////////////// -MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params) { +MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge) { this->generating = false; this->id = mapgenid; + this->emerge = emerge; this->seed = (int)params->seed; this->water_level = params->water_level; @@ -463,6 +464,12 @@ void MapgenV6::makeChunk(BlockMakeData *data) { if (flags & MG_TREES) placeTreesAndJungleGrass(); + // Generate the registered ores + for (unsigned int i = 0; i != emerge->ores.size(); i++) { + Ore *ore = emerge->ores[i]; + ore->generate(this, blockseed + i, node_min, node_max); + } + // Calculate lighting calcLighting(node_min, node_max); @@ -494,14 +501,13 @@ void MapgenV6::calculateNoise() { noise_height_select->perlinMap2D( x + 0.5 * noise_height_select->np->spread.X, z + 0.5 * noise_height_select->np->spread.Z); - } - - if (!(flags & MG_FLAT)) { + noise_mud->perlinMap2D( x + 0.5 * noise_mud->np->spread.X, z + 0.5 * noise_mud->np->spread.Z); noise_mud->transformNoiseMap(); } + noise_beach->perlinMap2D( x + 0.2 * noise_beach->np->spread.X, z + 0.7 * noise_beach->np->spread.Z); |