BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Biome API: Enable biome generation to lower world limit

Browse Source 
Decorations: Remove lower limit of water level for placement
This commit is contained in:
paramat 2015-06-13 01:26:56 +01:00
parent bb5f830d16
commit 38482d2656
5 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mapgen_v5.cpp
View File

@ -327,11 +327,9 @@ void MapgenV5::calculateNoise()
noise_cave2->perlinMap3D(x, y, z);
}
if (node_max.Y >= BIOMEGEN_BASE_V5) {
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
}
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
//printf("calculateNoise: %dus\n", t.stop());
}
@ -396,9 +394,6 @@ int MapgenV5::generateBaseTerrain()
MgStoneType MapgenV5::generateBiomes(float *heat_map, float *humidity_map)
{
if (node_max.Y < BIOMEGEN_BASE_V5)
return STONE;
v3s16 em = vm->m_area.getExtent();
u32 index = 0;
MgStoneType stone_type = STONE;

1
src/mapgen_v5.h
View File

@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h"
#define LARGE_CAVE_DEPTH -256
#define BIOMEGEN_BASE_V5 -192
/////////////////// Mapgen V5 flags
//#define MGV5_ 0x01

11
src/mapgen_v7.cpp
View File

@ -362,11 +362,9 @@ void MapgenV7::calculateNoise()
noise_mount_height->perlinMap2D(x, z);
}
if (node_max.Y >= BIOMEGEN_BASE_V7) {
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
}
noise_filler_depth->perlinMap2D(x, z);
noise_heat->perlinMap2D(x, z);
noise_humidity->perlinMap2D(x, z);
//printf("calculateNoise: %dus\n", t.stop());
}
@ -591,9 +589,6 @@ void MapgenV7::generateRidgeTerrain()
MgStoneType MapgenV7::generateBiomes(float *heat_map, float *humidity_map)
{
if (node_max.Y < BIOMEGEN_BASE_V7)
return STONE;
v3s16 em = vm->m_area.getExtent();
u32 index = 0;
MgStoneType stone_type = STONE;

2
src/mapgen_v7.h
View File

@ -22,8 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapgen.h"
#define BIOMEGEN_BASE_V7 -192
/////////////////// Mapgen V7 flags
#define MGV7_MOUNTAINS 0x01
#define MGV7_RIDGES 0x02

1
src/mg_decoration.cpp
View File

@ -129,7 +129,6 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
s16 y = mg->heightmap ?
mg->heightmap[mapindex] :
mg->findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
y = MYMAX(y, mg->water_level);
if (y < nmin.Y || y > nmax.Y ||
y < y_min || y > y_max)