diff options
author | kwolekr <mirrorisim@gmail.com> | 2013-02-17 02:46:08 -0500 |
---|---|---|
committer | kwolekr <mirrorisim@gmail.com> | 2013-02-25 23:08:33 -0500 |
commit | 67c59645ecd76cbf7a8186d0850ab5950e9ea22a (patch) | |
tree | a75281bb1cd592a18f933c02030a2f58e360c73f /src/map.cpp | |
parent | 5ec5b1cbd64a22e628be2cf03391883c44074811 (diff) | |
download | minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.tar.gz minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.tar.bz2 minetest-67c59645ecd76cbf7a8186d0850ab5950e9ea22a.zip |
Misc. cleanup and minor fixes
Diffstat (limited to 'src/map.cpp')
-rw-r--r-- | src/map.cpp | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/src/map.cpp b/src/map.cpp index a8928d864..3f2f8d1d3 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2143,14 +2143,10 @@ ServerMap::~ServerMap() #endif } -void ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos) +bool ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos) { - bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info"); - if(enable_mapgen_debug_info) - infostream<<"initBlockMake(): " - <<"("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<") - " - <<"("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")" - <<std::endl; + bool enable_mapgen_debug_info = m_emerge->mapgen_debug_info; + EMERGE_DBG_OUT("initBlockMake(): " PP(blockpos) " - " PP(blockpos)); //s16 chunksize = 3; //v3s16 chunk_offset(-1,-1,-1); @@ -2170,12 +2166,8 @@ void ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos) // Do nothing if not inside limits (+-1 because of neighbors) if(blockpos_over_limit(blockpos_min - extra_borders) || blockpos_over_limit(blockpos_max + extra_borders)) - { - data->no_op = true; - return; - } + return false; - data->no_op = false; data->seed = m_seed; data->blockpos_min = blockpos_min; data->blockpos_max = blockpos_max; @@ -2263,6 +2255,7 @@ void ServerMap::initBlockMake(BlockMakeData *data, v3s16 blockpos) } // Data is ready now. + return true; } MapBlock* ServerMap::finishBlockMake(BlockMakeData *data, @@ -2277,13 +2270,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data, v3s16 extra_borders(1,1,1); - if(data->no_op) - { - //infostream<<"finishBlockMake(): no-op"<<std::endl; - return NULL; - } - - bool enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info"); + bool enable_mapgen_debug_info = m_emerge->mapgen_debug_info; /*infostream<<"Resulting vmanip:"<<std::endl; data->vmanip.print(infostream);*/ @@ -2311,9 +2298,7 @@ MapBlock* ServerMap::finishBlockMake(BlockMakeData *data, data->vmanip->blitBackAll(&changed_blocks); } - if(enable_mapgen_debug_info) - infostream<<"finishBlockMake: changed_blocks.size()=" - <<changed_blocks.size()<<std::endl; + EMERGE_DBG_OUT("finishBlockMake: changed_blocks.size()=" << changed_blocks.size()); /* Copy transforming liquid information |