oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

moved mapgen stuff around abit

Browse source
This commit is contained in:
Perttu Ahola 2011-06-25 18:35:32 +03:00
parent f2c26e2014
commit a80025c352
4 changed files with 61 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/map.cpp
View file

@ -1969,7 +1969,7 @@ ServerMap::~ServerMap()
#endif
}
void ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos)
{
/*dstream<<"initBlockMake(): ("<<blockpos.X<<","<<blockpos.Y<<","
<<blockpos.Z<<")"<<std::endl;*/
@ -2022,18 +2022,19 @@ void ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
v3s16 bigarea_blocks_min = blockpos - v3s16(1,1,1);
v3s16 bigarea_blocks_max = blockpos + v3s16(1,1,1);
data->vmanip.setMap(this);
data->vmanip = new ManualMapVoxelManipulator(this);
//data->vmanip->setMap(this);
// Add the area
{
//TimeTaker timer("initBlockMake() initialEmerge");
data->vmanip.initialEmerge(bigarea_blocks_min, bigarea_blocks_max);
data->vmanip->initialEmerge(bigarea_blocks_min, bigarea_blocks_max);
}
// Data is ready now.
}
MapBlock* ServerMap::finishBlockMake(BlockMakeData *data,
MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data,
core::map<v3s16, MapBlock*> &changed_blocks)
{
v3s16 blockpos = data->blockpos;
@ -2056,7 +2057,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data,
{
// 70ms @cs=8
//TimeTaker timer("finishBlockMake() blitBackAll");
data->vmanip.blitBackAll(&changed_blocks);
data->vmanip->blitBackAll(&changed_blocks);
}
#if 1
dstream<<"finishBlockMake: changed_blocks.size()="
@ -2248,7 +2249,7 @@ MapBlock * ServerMap::generateBlock(
/*
Create block make data
*/
BlockMakeData data;
mapgen::BlockMakeData data;
initBlockMake(&data, p);
/*