diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-02-09 16:36:30 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-02-09 16:36:30 -0500 |
| commit | 89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13 (patch) | |
| tree | 0906b5428135a32dfbacb97601586555305c6927 /src/map.cpp | |
| parent | a0683b811c6641528161050ea91f0425f038fa90 (diff) | |
| download | minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.tar.gz minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.tar.bz2 minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.zip | |
ServerEnvironment: Remove direct dependency on EmergeManager
Diffstat (limited to 'src/map.cpp')
| -rw-r--r-- | src/map.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/map.cpp b/src/map.cpp index 075649f94..22ea41e04 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3126,7 +3126,9 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank) return block; } - /*if(allow_generate) + +#if 0 + if(allow_generate) { std::map<v3s16, MapBlock*> modified_blocks; MapBlock *block = generateBlock(p, modified_blocks); @@ -3149,11 +3151,21 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank) return block; } - }*/ + } +#endif return NULL; } +MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d) +{ + MapBlock *block = getBlockNoCreateNoEx(p3d); + if (block == NULL) + m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, false); + + return block; +} + void ServerMap::prepareBlock(MapBlock *block) { ServerEnvironment *senv = &((Server *)m_gamedef)->getEnv(); |