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

Shorten ManualMapVoxelManipulator to MMVManip

Browse source
This commit is contained in:
kwolekr 2015-01-05 02:42:27 -05:00
parent 7289d61e99
commit 2d849b0a19
18 changed files with 103 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/map.cpp
View file

@ -2305,7 +2305,7 @@ bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos)
v3s16 bigarea_blocks_min = blockpos_min - extra_borders;
v3s16 bigarea_blocks_max = blockpos_max + extra_borders;
data->vmanip = new ManualMapVoxelManipulator(this);
data->vmanip = new MMVManip(this);
//data->vmanip->setMap(this);
// Add the area
@ -2823,7 +2823,7 @@ void ServerMap::updateVManip(v3s16 pos)
if (!mg)
return;
ManualMapVoxelManipulator *vm = mg->vm;
MMVManip *vm = mg->vm;
if (!vm)
return;
@ -3589,7 +3589,7 @@ void ServerMap::PrintInfo(std::ostream &out)
out<<"ServerMap: ";
}
ManualMapVoxelManipulator::ManualMapVoxelManipulator(Map *map):
MMVManip::MMVManip(Map *map):
VoxelManipulator(),
m_is_dirty(false),
m_create_area(false),
@ -3597,12 +3597,12 @@ ManualMapVoxelManipulator::ManualMapVoxelManipulator(Map *map):
{
}
ManualMapVoxelManipulator::~ManualMapVoxelManipulator()
MMVManip::~MMVManip()
{
}
void ManualMapVoxelManipulator::initialEmerge(v3s16 blockpos_min,
v3s16 blockpos_max, bool load_if_inexistent)
void MMVManip::initialEmerge(v3s16 blockpos_min, v3s16 blockpos_max,
bool load_if_inexistent)
{
TimeTaker timer1("initialEmerge", &emerge_time);
@ -3690,9 +3690,8 @@ void ManualMapVoxelManipulator::initialEmerge(v3s16 blockpos_min,
m_is_dirty = false;
}
void ManualMapVoxelManipulator::blitBackAll(
std::map<v3s16, MapBlock*> *modified_blocks,
bool overwrite_generated)
void MMVManip::blitBackAll(std::map<v3s16, MapBlock*> *modified_blocks,
bool overwrite_generated)
{
if(m_area.getExtent() == v3s16(0,0,0))
return;