diff options
| author | kwolekr <mirrorisim@gmail.com> | 2012-11-25 21:16:48 -0500 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2013-01-21 21:41:33 +0200 |
| commit | 11afcbff69c95915e5142bc4b55636ff6358ece9 (patch) | |
| tree | 1e6a3242e83443b665d9b781c84abad4e662f83d /src/environment.cpp | |
| parent | 736b386554a6b385a34f40c0411c6e466ebec30a (diff) | |
| download | minetest-11afcbff69c95915e5142bc4b55636ff6358ece9.tar.gz minetest-11afcbff69c95915e5142bc4b55636ff6358ece9.tar.bz2 minetest-11afcbff69c95915e5142bc4b55636ff6358ece9.zip | |
The new mapgen, noise functions, et al.
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index 3f94484fe..51255b918 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1301,6 +1301,7 @@ u16 ServerEnvironment::addActiveObject(ServerActiveObject *object) return id; } +#if 0 bool ServerEnvironment::addActiveObjectAsStatic(ServerActiveObject *obj) { assert(obj); @@ -1343,6 +1344,7 @@ bool ServerEnvironment::addActiveObjectAsStatic(ServerActiveObject *obj) return succeeded; } +#endif /* Finds out what new objects have been added to @@ -1563,13 +1565,15 @@ void ServerEnvironment::removeRemovedObjects() */ if(obj->m_static_exists && obj->m_removed) { - MapBlock *block = m_map->emergeBlock(obj->m_static_block); - if(block) - { + MapBlock *block = m_map->emergeBlock(obj->m_static_block, false); + if (block) { block->m_static_objects.remove(id); block->raiseModified(MOD_STATE_WRITE_NEEDED, "removeRemovedObjects"); obj->m_static_exists = false; + } else { + infostream << "failed to emerge block from which " + "an object to be removed was loaded from. id="<<id<<std::endl; } } @@ -1717,6 +1721,8 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s) If force_delete is set, active object is deleted nevertheless. It shall only be set so in the destructor of the environment. + + If block wasn't generated (not in memory or on disk), */ void ServerEnvironment::deactivateFarObjects(bool force_delete) { |