Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 11:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Heightmaps: Fix uninitialised values in mgv5/mgv6. findGroundLevel: Return -MAP_GENERATION_LIMIT if surface not found

Browse Source
This commit is contained in:
paramat 2015-03-07 03:15:12 +00:00
parent 267c9f4cb4
commit d463000595
5 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mapgen.cpp
View File

@ -41,8 +41,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
const char *GenElementManager::ELEMENT_TITLE = "element"; const char *GenElementManager::ELEMENT_TITLE = "element";
static const s16 INVALID_HEIGHT = MAP_GENERATION_LIMIT + 1;
FlagDesc flagdesc_mapgen[] = { FlagDesc flagdesc_mapgen[] = {
{"trees", MG_TREES}, {"trees", MG_TREES},
{"caves", MG_CAVES}, {"caves", MG_CAVES},
@ -140,6 +138,7 @@ s16 Mapgen::findGroundLevelFull(v2s16 p2d)
} }
// Returns -MAP_GENERATION_LIMIT if not found
s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax) s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
{ {
v3s16 em = vm->m_area.getExtent(); v3s16 em = vm->m_area.getExtent();
@ -153,16 +152,10 @@ s16 Mapgen::findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax)
vm->m_area.add_y(em, i, -1); vm->m_area.add_y(em, i, -1);
} }
return y; return (y >= ymin) ? y : -MAP_GENERATION_LIMIT;
} }
void Mapgen::initHeightMap(s16 *dest, size_t len)
{
for (size_t i = 0; i < len; i++)
dest[i] = INVALID_HEIGHT;
}
void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax) void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
{ {
if (!heightmap) if (!heightmap)
@ -174,14 +167,6 @@ void Mapgen::updateHeightmap(v3s16 nmin, v3s16 nmax)
for (s16 x = nmin.X; x <= nmax.X; x++, index++) { for (s16 x = nmin.X; x <= nmax.X; x++, index++) {
s16 y = findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y); s16 y = findGroundLevel(v2s16(x, z), nmin.Y, nmax.Y);
if (heightmap[index] != INVALID_HEIGHT) {
// if the values found are out of range, trust the old heightmap
if (y == nmax.Y && heightmap[index] > nmax.Y)
continue;
if (y == nmin.Y - 1 && heightmap[index] < nmin.Y)
continue;
}
heightmap[index] = y; heightmap[index] = y;
} }
} }

1
src/mapgen.h
View File

@ -154,7 +154,6 @@ public:
static u32 getBlockSeed2(v3s16 p, int seed); static u32 getBlockSeed2(v3s16 p, int seed);
s16 findGroundLevelFull(v2s16 p2d); s16 findGroundLevelFull(v2s16 p2d);
s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax); s16 findGroundLevel(v2s16 p2d, s16 ymin, s16 ymax);
void initHeightMap(s16 *dest, size_t len);
void updateHeightmap(v3s16 nmin, v3s16 nmax); void updateHeightmap(v3s16 nmin, v3s16 nmax);
void updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax); void updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax);

2
src/mapgen_v5.cpp
View File

@ -60,8 +60,6 @@ MapgenV5::MapgenV5(int mapgenid, MapgenParams *params, EmergeManager *emerge)
this->biomemap = new u8[csize.X * csize.Z]; this->biomemap = new u8[csize.X * csize.Z];
this->heightmap = new s16[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z];
initHeightMap(this->heightmap, csize.X * csize.Z);
MapgenV5Params *sp = (MapgenV5Params *)params->sparams; MapgenV5Params *sp = (MapgenV5Params *)params->sparams;
this->spflags = sp->spflags; this->spflags = sp->spflags;

2
src/mapgen_v6.cpp
View File

@ -57,8 +57,6 @@ MapgenV6::MapgenV6(int mapgenid, MapgenParams *params, EmergeManager *emerge)
this->heightmap = new s16[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z];
initHeightMap(this->heightmap, csize.X * csize.Z);
MapgenV6Params *sp = (MapgenV6Params *)params->sparams; MapgenV6Params *sp = (MapgenV6Params *)params->sparams;
this->spflags = sp->spflags; this->spflags = sp->spflags;
this->freq_desert = sp->freq_desert; this->freq_desert = sp->freq_desert;

2
src/mapgen_v7.cpp
View File

@ -64,8 +64,6 @@ MapgenV7::MapgenV7(int mapgenid, MapgenParams *params, EmergeManager *emerge)
this->heightmap = new s16[csize.X * csize.Z]; this->heightmap = new s16[csize.X * csize.Z];
this->ridge_heightmap = new s16[csize.X * csize.Z]; this->ridge_heightmap = new s16[csize.X * csize.Z];
initHeightMap(this->heightmap, csize.X * csize.Z);
MapgenV7Params *sp = (MapgenV7Params *)params->sparams; MapgenV7Params *sp = (MapgenV7Params *)params->sparams;
this->spflags = sp->spflags; this->spflags = sp->spflags;