diff options
| author | paramat <mat.gregory@virginmedia.com> | 2016-06-03 12:58:50 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-06-05 16:37:02 +0100 |
| commit | d24f3841740b471eff384c8bd6e8bbfdfd03a3e2 (patch) | |
| tree | de6aad2e1173a9bdf3e67d730f5c65bc25cffa06 /src/mapgen_valleys.cpp | |
| parent | 7841f1c5098d73b7538623cf898ca1e32ac6773d (diff) | |
| download | minetest-d24f3841740b471eff384c8bd6e8bbfdfd03a3e2.tar.gz minetest-d24f3841740b471eff384c8bd6e8bbfdfd03a3e2.tar.bz2 minetest-d24f3841740b471eff384c8bd6e8bbfdfd03a3e2.zip | |
Biome API: Add per-biome riverbed material and depth
Mgvalleys: Remove riverbed sand placement from base terrain generation
Riverbed material placement moved to MapgenBasic::generateBiomes()
Document fields and add note that the biome API is still unstable
Diffstat (limited to 'src/mapgen_valleys.cpp')
| -rw-r--r-- | src/mapgen_valleys.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/mapgen_valleys.cpp b/src/mapgen_valleys.cpp index 2cd733d36..6581b792f 100644 --- a/src/mapgen_valleys.cpp +++ b/src/mapgen_valleys.cpp @@ -114,11 +114,6 @@ MapgenValleys::MapgenValleys(int mapgenid, MapgenParams *params, EmergeManager * // Resolve content to be used c_lava_source = ndef->getId("mapgen_lava_source"); - c_sand = ndef->getId("mapgen_sand"); - - // Fall back to more basic content if not defined - if (c_sand == CONTENT_IGNORE) - c_sand = c_stone; } @@ -493,7 +488,6 @@ int MapgenValleys::generateTerrain() MapNode n_air(CONTENT_AIR); MapNode n_river_water(c_river_water_source); - MapNode n_sand(c_sand); MapNode n_stone(c_stone); MapNode n_water(c_water_source); @@ -537,10 +531,7 @@ int MapgenValleys::generateTerrain() float surface_delta = (float)y - surface_y; bool river = y + 1 < river_y; - if (fabs(surface_delta) <= 0.5f && y > water_level && river) { - // river bottom - vm->m_data[index_data] = n_sand; - } else if (slope * fill > surface_delta) { + if (slope * fill > surface_delta) { // ground vm->m_data[index_data] = n_stone; if (y > heightmap[index_2d]) @@ -553,7 +544,7 @@ int MapgenValleys::generateTerrain() } else if (river) { // river vm->m_data[index_data] = n_river_water; - } else { + } else { // air vm->m_data[index_data] = n_air; } } |