diff options
| author | kwolekr <kwolekr@minetest.net> | 2016-05-19 14:05:51 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-05-27 23:23:58 -0400 |
| commit | c5968049bbf73ceff08a2b1d35bb34192fa3f315 (patch) | |
| tree | f0c45ac76e26e1c7adb36a94d3ded88f4c60b2ec | |
| parent | 548d99bb456931192609e8c6fa1eb4c80679af42 (diff) | |
| download | minetest-c5968049bbf73ceff08a2b1d35bb34192fa3f315.tar.gz minetest-c5968049bbf73ceff08a2b1d35bb34192fa3f315.tar.bz2 minetest-c5968049bbf73ceff08a2b1d35bb34192fa3f315.zip | |
Mapgen V7: Remove now-unused ridge heightmap
| -rw-r--r-- | src/mapgen_v7.cpp | 10 | ||||
| -rw-r--r-- | src/mapgen_v7.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index e297a1d3e..ee2c5f45f 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -62,8 +62,7 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge) // 1-up 1-down overgeneration this->zstride_1u1d = csize.X * (csize.Y + 2); - this->heightmap = new s16[csize.X * csize.Z]; - this->ridge_heightmap = new s16[csize.X * csize.Z]; + this->heightmap = new s16[csize.X * csize.Z]; MapgenV7Params *sp = (MapgenV7Params *)params->sparams; @@ -134,7 +133,6 @@ MapgenV7::~MapgenV7() delete biomegen; - delete[] ridge_heightmap; delete[] heightmap; } @@ -440,8 +438,7 @@ int MapgenV7::generateTerrain() for (s16 z = node_min.Z; z <= node_max.Z; z++) for (s16 x = node_min.X; x <= node_max.X; x++, index2d++) { s16 surface_y = baseTerrainLevelFromMap(index2d); - heightmap[index2d] = surface_y; // Create base terrain heightmap - ridge_heightmap[index2d] = surface_y; + heightmap[index2d] = surface_y; // Create base terrain heightmap if (surface_y > stone_surface_max_y) stone_surface_max_y = surface_y; @@ -504,9 +501,6 @@ void MapgenV7::generateRidgeTerrain() if (nridge + width_mod * height_mod < 0.6) continue; - if (y < ridge_heightmap[j]) - ridge_heightmap[j] = y - 1; - vm->m_data[vi] = (y > water_level) ? n_air : n_water; } } diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h index 21beab2b4..eb89d5978 100644 --- a/src/mapgen_v7.h +++ b/src/mapgen_v7.h @@ -58,8 +58,6 @@ class MapgenV7 : public MapgenBasic { public: int zstride_1u1d; - s16 *ridge_heightmap; - u32 spflags; Noise *noise_terrain_base; Noise *noise_terrain_alt; |