ToolDefManager serialization

[oweals/minetest.git] / src / content_sao.cpp

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 1096ac116ecbc410a5d3bf5e5c7f709f932ac0ac..a7cee83ab1807e9f0e741304521c381717683f63 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "collision.h"
 #include "environment.h"
 #include "settings.h"
+#include "main.h" // For g_profiler
 #include "profiler.h"
 
 core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
@@ -158,8 +159,9 @@ void ItemSAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        
        if(send_recommended == false)
                return;
@@ -223,7 +225,8 @@ InventoryItem * ItemSAO::createInventoryItem()
 {
        try{
                std::istringstream is(m_inventorystring, std::ios_base::binary);
-               InventoryItem *item = InventoryItem::deSerialize(is);
+               IGameDef *gamedef = m_env->getGameDef();
+               InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
                infostream<<__FUNCTION_NAME<<": m_inventorystring=\""
                                <<m_inventorystring<<"\" -> item="<<item
                                <<std::endl;
@@ -400,8 +403,9 @@ void RatSAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        setBasePosition(pos_f);
@@ -448,7 +452,8 @@ std::string RatSAO::getStaticData()
 void RatSAO::punch(ServerActiveObject *puncher)
 {
        std::istringstream is("CraftItem rat 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        bool fits = puncher->addToInventory(item);
        if(fits)
                m_removed = true;
@@ -636,8 +641,9 @@ void Oerkki1SAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);*/
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMovePrecise(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMovePrecise(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        // Do collision damage
@@ -884,8 +890,9 @@ void FireflySAO::step(float dtime, bool send_recommended)
                m_speed_f *= pos_max_d / (m_speed_f.getLength()*dtime);
        v3f pos_f = getBasePosition();
        v3f pos_f_old = pos_f;
-       moveresult = collisionMoveSimple(&m_env->getMap(), pos_max_d,
-                       box, dtime, pos_f, m_speed_f);
+       IGameDef *gamedef = m_env->getGameDef();
+       moveresult = collisionMoveSimple(&m_env->getMap(), gamedef,
+                       pos_max_d, box, dtime, pos_f, m_speed_f);
        m_touching_ground = moveresult.touching_ground;
        
        setBasePosition(pos_f);
@@ -932,7 +939,8 @@ std::string FireflySAO::getStaticData()
 InventoryItem* FireflySAO::createPickedUpItem()
 {
        std::istringstream is("CraftItem firefly 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        return item;
 }
 
@@ -1563,13 +1571,14 @@ LuaEntitySAO::~LuaEntitySAO()
        delete m_prop;
 }
 
-void LuaEntitySAO::addedToEnvironment(u16 id)
+void LuaEntitySAO::addedToEnvironment()
 {
-       ServerActiveObject::addedToEnvironment(id);
+       ServerActiveObject::addedToEnvironment();
        
        // Create entity from name and state
        lua_State *L = m_env->getLua();
-       m_registered = scriptapi_luaentity_add(L, id, m_init_name.c_str(), m_init_state.c_str());
+       m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str(),
+                       m_init_state.c_str());
        
        if(m_registered){
                // Get properties
@@ -1660,7 +1669,8 @@ std::string LuaEntitySAO::getStaticData()
 InventoryItem* LuaEntitySAO::createPickedUpItem()
 {
        std::istringstream is("CraftItem testobject1 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
        return item;
 }