minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fixed new map generator causing a crash when generating at map limit

mutilcraft-mt53
Perttu Ahola 2011-07-22 01:37:05 +03:00
parent 74ef5b8a42
commit fe855e004f
2 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/map.cpp
View File

@ -2013,6 +2013,14 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
/*dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<"," /*dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
<<blockpos.Z<<")"<<std::endl;*/ <<blockpos.Z<<")"<<std::endl;*/
// Do nothing if not inside limits (+-1 because of neighbors)
if(blockpos_over_limit(blockpos - v3s16(1,1,1)) ||
blockpos_over_limit(blockpos + v3s16(1,1,1)))
{
data->no_op = true;
return;
}
data->no_op = false; data->no_op = false;
data->seed = m_seed; data->seed = m_seed;
data->blockpos = blockpos; data->blockpos = blockpos;
@ -2063,6 +2071,7 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
neighboring blocks neighboring blocks
*/ */
// The area that contains this block and it's neighbors
v3s16 bigarea_blocks_min = blockpos - v3s16(1,1,1); v3s16 bigarea_blocks_min = blockpos - v3s16(1,1,1);
v3s16 bigarea_blocks_max = blockpos + v3s16(1,1,1); v3s16 bigarea_blocks_max = blockpos + v3s16(1,1,1);
@ -2087,7 +2096,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
if(data->no_op) if(data->no_op)
{ {
dstream<<"finishBlockMake(): no-op"<<std::endl; //dstream<<"finishBlockMake(): no-op"<<std::endl;
return NULL; return NULL;
} }
@ -2339,49 +2348,54 @@ MapBlock * ServerMap::generateBlock(
Get central block Get central block
*/ */
MapBlock *block = getBlockNoCreateNoEx(p); MapBlock *block = getBlockNoCreateNoEx(p);
assert(block);
#if 0 #if 0
/* /*
Check result Check result
*/ */
bool erroneus_content = false; if(block)
for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
{ {
v3s16 p(x0,y0,z0); bool erroneus_content = false;
MapNode n = block->getNode(p); for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
if(n.d == CONTENT_IGNORE) for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
{
v3s16 p(x0,y0,z0);
MapNode n = block->getNode(p);
if(n.d == CONTENT_IGNORE)
{
dstream<<"CONTENT_IGNORE at "
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
<<std::endl;
erroneus_content = true;
assert(0);
}
}
if(erroneus_content)
{ {
dstream<<"CONTENT_IGNORE at "
<<"("<<p.X<<","<<p.Y<<","<<p.Z<<")"
<<std::endl;
erroneus_content = true;
assert(0); assert(0);
} }
} }
if(erroneus_content)
{
assert(0);
}
#endif #endif
#if 0 #if 0
/* /*
Generate a completely empty block Generate a completely empty block
*/ */
for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++) if(block)
for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
{ {
for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++) for(s16 z0=0; z0<MAP_BLOCKSIZE; z0++)
for(s16 x0=0; x0<MAP_BLOCKSIZE; x0++)
{ {
MapNode n; for(s16 y0=0; y0<MAP_BLOCKSIZE; y0++)
if(y0%2==0) {
n.d = CONTENT_AIR; MapNode n;
else if(y0%2==0)
n.d = CONTENT_STONE; n.d = CONTENT_AIR;
block->setNode(v3s16(x0,y0,z0), n); else
n.d = CONTENT_STONE;
block->setNode(v3s16(x0,y0,z0), n);
}
} }
} }
#endif #endif

2
src/mapgen.cpp
View File

@ -1303,7 +1303,7 @@ void make_block(BlockMakeData *data)
{ {
if(data->no_op) if(data->no_op)
{ {
dstream<<"makeBlock: no-op"<<std::endl; //dstream<<"makeBlock: no-op"<<std::endl;
return; return;
} }