summaryrefslogtreecommitdiff
path: root/src/map.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2015-01-05 02:42:27 -0500
committerkwolekr <kwolekr@minetest.net>2015-01-05 02:42:27 -0500
commit2d849b0a19af03913e564e2b6dbc36eecdd5ae0c (patch)
tree4f1cfff6586c305c419562173b73c9ab9410c401 /src/map.cpp
parent7289d61e99625b46eb2c4d6b90a2a5de42f207e6 (diff)
downloadminetest-2d849b0a19af03913e564e2b6dbc36eecdd5ae0c.tar.gz
minetest-2d849b0a19af03913e564e2b6dbc36eecdd5ae0c.tar.bz2
minetest-2d849b0a19af03913e564e2b6dbc36eecdd5ae0c.zip
Shorten ManualMapVoxelManipulator to MMVManip
Diffstat (limited to 'src/map.cpp')
-rw-r--r--src/map.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/map.cpp b/src/map.cpp
index 1c1cd7c28..d7d6aff54 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -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;