New kind of tool speed and wear calculation thingy

[dragonfireclient.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index e75e967c28dc4fee98e6e89646f965f4191b14d7..d9f24ede90aad05e7e5683fb09a4a30cffe41a82 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -30,6 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include "profiler.h"
 #include "scriptapi.h"
+#include "mapnode_contentfeatures.h"
+#include "nodemetadata.h"
 
 #define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
 
@@ -606,7 +608,7 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
        activateObjects(block);
 
        // Run node metadata
-       bool changed = block->m_node_metadata.step((float)dtime_s);
+       bool changed = block->m_node_metadata->step((float)dtime_s);
        if(changed)
        {
                MapEditEvent event;
@@ -916,7 +918,7 @@ void ServerEnvironment::step(float dtime)
                        block->setTimestampNoChangedFlag(m_game_time);
 
                        // Run node metadata
-                       bool changed = block->m_node_metadata.step(dtime);
+                       bool changed = block->m_node_metadata->step(dtime);
                        if(changed)
                        {
                                MapEditEvent event;
@@ -1141,6 +1143,11 @@ void ServerEnvironment::step(float dtime)
                }
        }
        
+       /*
+               Step script environment (run global on_step())
+       */
+       scriptapi_environment_step(m_lua, dtime);
+
        /*
                Step active objects
        */
@@ -1749,8 +1756,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 +1768,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 +1780,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 +1805,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;