diff options
| author | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-06-01 13:18:52 +0200 |
| commit | 1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124 (patch) | |
| tree | 54660f353f3342f89b6259ea6a5dfedfa20dc16f /src/mapgen_v7.cpp | |
| parent | ec039a3d123120f9918812b13f5971e94546b9af (diff) | |
| parent | 64627817fcca52f20948c24b60ce192b218f6ce2 (diff) | |
| download | minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.gz minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.tar.bz2 minetest-1dfc2e02b3c358af4bb20bb3cb60ac7bd3ed1124.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/mapgen_v7.cpp')
| -rw-r--r-- | src/mapgen_v7.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp index 4bfc866e2..6daa5fc6a 100644 --- a/src/mapgen_v7.cpp +++ b/src/mapgen_v7.cpp @@ -85,12 +85,12 @@ MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge) this->ridge_heightmap = new s16[csize.X * csize.Z]; // Terrain noise - noise_terrain_base = new Noise(params->np_terrain_base, seed, csize.X, csize.Z); - noise_terrain_alt = new Noise(params->np_terrain_alt, seed, csize.X, csize.Z); - noise_terrain_mod = new Noise(params->np_terrain_mod, seed, csize.X, csize.Z); - noise_terrain_persist = new Noise(params->np_terrain_persist, seed, csize.X, csize.Z); - noise_height_select = new Noise(params->np_height_select, seed, csize.X, csize.Z); - noise_ridge = new Noise(params->np_ridge, seed, csize.X, csize.Y, csize.Z); + noise_terrain_base = new Noise(¶ms->np_terrain_base, seed, csize.X, csize.Z); + noise_terrain_alt = new Noise(¶ms->np_terrain_alt, seed, csize.X, csize.Z); + noise_terrain_mod = new Noise(¶ms->np_terrain_mod, seed, csize.X, csize.Z); + noise_terrain_persist = new Noise(¶ms->np_terrain_persist, seed, csize.X, csize.Z); + noise_height_select = new Noise(¶ms->np_height_select, seed, csize.X, csize.Z); + noise_ridge = new Noise(¶ms->np_ridge, seed, csize.X, csize.Y, csize.Z); // Biome noise noise_heat = new Noise(bmgr->np_heat, seed, csize.X, csize.Z); @@ -152,8 +152,6 @@ void MapgenV7::makeChunk(BlockMakeData *data) { v3s16 blockpos_min = data->blockpos_min; v3s16 blockpos_max = data->blockpos_max; - v3s16 blockpos_full_min = blockpos_min - v3s16(1, 1, 1); - v3s16 blockpos_full_max = blockpos_max + v3s16(1, 1, 1); node_min = blockpos_min * MAP_BLOCKSIZE; node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1); full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE; |