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 80e9d5c78bc3eeadf3affabf6f57ff7a05588a77..d9f24ede90aad05e7e5683fb09a4a30cffe41a82 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -29,6 +29,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #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<<")"
 
@@ -267,9 +270,9 @@ void ActiveBlockList::update(core::list<v3s16> &active_positions,
        ServerEnvironment
 */
 
-ServerEnvironment::ServerEnvironment(ServerMap *map, Server *server):
+ServerEnvironment::ServerEnvironment(ServerMap *map, lua_State *L):
        m_map(map),
-       m_server(server),
+       m_lua(L),
        m_random_spawn_timer(3),
        m_send_recommended_timer(0),
        m_game_time(0),
@@ -605,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;
@@ -674,6 +677,8 @@ void ServerEnvironment::clearAllObjects()
                        obj->m_removed = true;
                        continue;
                }
+               // Deregister in scripting api
+               scriptapi_rm_object_reference(m_lua, obj);
                // Delete active object
                delete obj;
                // Id to be removed from m_active_objects
@@ -913,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;
@@ -1043,7 +1048,7 @@ void ServerEnvironment::step(float dtime)
                                                                n1.getContent() == CONTENT_AIR)
                                                {
                                                        v3f pos = intToFloat(p1, BS);
-                                                       ServerActiveObject *obj = new RatSAO(this, 0, pos);
+                                                       ServerActiveObject *obj = new RatSAO(this, pos);
                                                        addActiveObject(obj);
                                                }
                                        }
@@ -1071,21 +1076,21 @@ void ServerEnvironment::step(float dtime)
                                                                        Settings properties;
                                                                        getMob_dungeon_master(properties);
                                                                        ServerActiveObject *obj = new MobV2SAO(
-                                                                                       this, 0, pos, &properties);
+                                                                                       this, pos, &properties);
                                                                        addActiveObject(obj);
                                                                } else if(i == 2 || i == 3){
                                                                        actionstream<<"Rats spawn at "
                                                                                        <<PP(p1)<<std::endl;
                                                                        for(int j=0; j<3; j++){
                                                                                ServerActiveObject *obj = new RatSAO(
-                                                                                               this, 0, pos);
+                                                                                               this, pos);
                                                                                addActiveObject(obj);
                                                                        }
                                                                } else {
                                                                        actionstream<<"An oerkki spawns at "
                                                                                        <<PP(p1)<<std::endl;
                                                                        ServerActiveObject *obj = new Oerkki1SAO(
-                                                                                       this, 0, pos);
+                                                                                       this, pos);
                                                                        addActiveObject(obj);
                                                                }
                                                        }
@@ -1138,6 +1143,11 @@ void ServerEnvironment::step(float dtime)
                }
        }
        
+       /*
+               Step script environment (run global on_step())
+       */
+       scriptapi_environment_step(m_lua, dtime);
+
        /*
                Step active objects
        */
@@ -1150,9 +1160,9 @@ void ServerEnvironment::step(float dtime)
                // This helps the objects to send data at the same time
                bool send_recommended = false;
                m_send_recommended_timer += dtime;
-               if(m_send_recommended_timer > 0.10)
+               if(m_send_recommended_timer > getSendRecommendedInterval())
                {
-                       m_send_recommended_timer = 0;
+                       m_send_recommended_timer -= getSendRecommendedInterval();
                        send_recommended = true;
                }
 
@@ -1228,18 +1238,18 @@ void ServerEnvironment::step(float dtime)
                        Create a ServerActiveObject
                */
 
-               //TestSAO *obj = new TestSAO(this, 0, pos);
-               //ServerActiveObject *obj = new ItemSAO(this, 0, pos, "CraftItem Stick 1");
-               //ServerActiveObject *obj = new RatSAO(this, 0, pos);
-               //ServerActiveObject *obj = new Oerkki1SAO(this, 0, pos);
-               //ServerActiveObject *obj = new FireflySAO(this, 0, pos);
+               //TestSAO *obj = new TestSAO(this, pos);
+               //ServerActiveObject *obj = new ItemSAO(this, pos, "CraftItem Stick 1");
+               //ServerActiveObject *obj = new RatSAO(this, pos);
+               //ServerActiveObject *obj = new Oerkki1SAO(this, pos);
+               //ServerActiveObject *obj = new FireflySAO(this, pos);
 
                infostream<<"Server: Spawning MobV2SAO at "
                                <<"("<<pos.X<<","<<pos.Y<<","<<pos.Z<<")"<<std::endl;
                
                Settings properties;
                getMob_dungeon_master(properties);
-               ServerActiveObject *obj = new MobV2SAO(this, 0, pos, &properties);
+               ServerActiveObject *obj = new MobV2SAO(this, pos, &properties);
                addActiveObject(obj);
        }
 #endif
@@ -1493,6 +1503,11 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
                                <<"could not find block for storing id="<<object->getId()
                                <<" statically"<<std::endl;
        }
+       
+       // Register reference in scripting api (must be done before post-init)
+       scriptapi_add_object_reference(m_lua, object);
+       // Post-initialize object
+       object->addedToEnvironment(object->getId());
 
        return object->getId();
 }
@@ -1544,6 +1559,9 @@ void ServerEnvironment::removeRemovedObjects()
                if(obj->m_known_by_count > 0)
                        continue;
                
+               // Deregister in scripting api
+               scriptapi_rm_object_reference(m_lua, obj);
+
                // Delete
                delete obj;
                // Id to be removed from m_active_objects
@@ -1738,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(): "
@@ -1748,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)
@@ -1758,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);
                        }
                }
@@ -1783,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;
@@ -1815,6 +1837,10 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
                verbosestream<<"ServerEnvironment::deactivateFarObjects(): "
                                <<"object id="<<id<<" is not known by clients"
                                <<"; deleting"<<std::endl;
+
+               // Deregister in scripting api
+               scriptapi_rm_object_reference(m_lua, obj);
+
                // Delete active object
                delete obj;
                // Id to be removed from m_active_objects