diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-12 15:14:24 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:40 +0200 |
| commit | 75a0ca6bd67aa9ca87668bc27d36399b5028c2b1 (patch) | |
| tree | 0ba77ad2aec19a52161c6a361e7f04b1aadf1512 /src/environment.cpp | |
| parent | 38944467d31bbfa8a98008962f147cbc3c73f507 (diff) | |
| download | minetest-75a0ca6bd67aa9ca87668bc27d36399b5028c2b1.tar.gz minetest-75a0ca6bd67aa9ca87668bc27d36399b5028c2b1.tar.bz2 minetest-75a0ca6bd67aa9ca87668bc27d36399b5028c2b1.zip | |
Scripting WIP
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index e75e967c2..d3e8fa12c 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -1749,8 +1749,10 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) if(n){ StaticObject static_old = n->getValue(); + float save_movem = obj->getMinimumSavedMovement(); + if(static_old.data == staticdata_new && - (static_old.pos - objectpos).getLength() < 2*BS) + (static_old.pos - objectpos).getLength() < save_movem) data_changed = false; } else { errorstream<<"ServerEnvironment::deactivateFarObjects(): " @@ -1759,6 +1761,8 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) <<PP(obj->m_static_block)<<std::endl; } } + + bool shall_be_written = (!stays_in_same_block || data_changed); // Delete old static object if(obj->m_static_exists) @@ -1769,7 +1773,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) block->m_static_objects.remove(id); obj->m_static_exists = false; // Only mark block as modified if data changed considerably - if(!stays_in_same_block || data_changed) + if(shall_be_written) block->raiseModified(MOD_STATE_WRITE_NEEDED); } } @@ -1794,7 +1798,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete) block->m_static_objects.insert(new_id, s_obj); // Only mark block as modified if data changed considerably - if(!stays_in_same_block || data_changed) + if(shall_be_written) block->raiseModified(MOD_STATE_WRITE_NEEDED); obj->m_static_exists = true; |