diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-17 13:40:47 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-17 13:40:47 +0300 |
| commit | 496e78398873794a95a57e38756399a8330b5c0c (patch) | |
| tree | b21b93e3564acfd8f3bf5ec49f2185b91c0bf544 | |
| parent | afa2b8714f2e5dcbc45099c9a9418b25bfcc097f (diff) | |
| download | minetest-496e78398873794a95a57e38756399a8330b5c0c.tar.gz minetest-496e78398873794a95a57e38756399a8330b5c0c.tar.bz2 minetest-496e78398873794a95a57e38756399a8330b5c0c.zip | |
A small fix to an unlikely situation where the map generator requires a block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.
| -rw-r--r-- | src/map.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/map.cpp b/src/map.cpp index dc66b4d55..9ff0fa6d3 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -2033,9 +2033,14 @@ void ServerMap::initBlockMake(mapgen::BlockMakeData *data, v3s16 blockpos) for(s16 y=-1; y<=1; y++) { - MapBlock *block = createBlock(blockpos); + //MapBlock *block = createBlock(blockpos); + // 1) get from memory, 2) load from disk + MapBlock *block = emergeBlock(blockpos, false); + // 3) create a blank one + if(block == NULL) + block = createBlock(blockpos); - // Lighting won't be calculated + // Lighting will not be valid after make_chunk is called block->setLightingExpired(true); // Lighting will be calculated //block->setLightingExpired(false); @@ -2152,10 +2157,18 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data, TimeTaker t("finishBlockMake lighting update"); core::map<v3s16, MapBlock*> lighting_update_blocks; +#if 1 // Center block lighting_update_blocks.insert(block->getPos(), block); - #if 0 +#endif +#if 0 // All modified blocks + // NOTE: Should this be done? If this is not done, then the lighting + // of the others will be updated in a different place, one by one, i + // think... or they might not? Well, at least they are left marked as + // "lighting expired"; it seems that is not handled at all anywhere, + // so enabling this will slow it down A LOT because otherwise it + // would not do this at all. This causes the black trees. for(core::map<v3s16, MapBlock*>::Iterator i = changed_blocks.getIterator(); i.atEnd() == false; i++) @@ -2163,7 +2176,7 @@ MapBlock* ServerMap::finishBlockMake(mapgen::BlockMakeData *data, lighting_update_blocks.insert(i.getNode()->getKey(), i.getNode()->getValue()); } - #endif +#endif updateLighting(lighting_update_blocks, changed_blocks); if(enable_mapgen_debug_info == false) |