ToolDefManager serialization

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

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 0abeb0ef047e30675d235f44c72ea96d16681d51..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;
@@ -237,14 +240,24 @@ InventoryItem * ItemSAO::createInventoryItem()
        }
 }
 
-void ItemSAO::rightClick(Player *player)
+void ItemSAO::punch(ServerActiveObject *puncher)
+{
+       InventoryItem *item = createInventoryItem();
+       bool fits = puncher->addToInventory(item);
+       if(fits)
+               m_removed = true;
+       else
+               delete item;
+}
+
+void ItemSAO::rightClick(ServerActiveObject *clicker)
 {
        infostream<<__FUNCTION_NAME<<std::endl;
        InventoryItem *item = createInventoryItem();
        if(item == NULL)
                return;
        
-       bool to_be_deleted = item->use(m_env, player);
+       bool to_be_deleted = item->use(m_env, clicker);
 
        if(to_be_deleted)
                m_removed = true;
@@ -252,7 +265,7 @@ void ItemSAO::rightClick(Player *player)
                // Reflect changes to the item here
                m_inventorystring = item->getItemString();
        
-       delete item;
+       delete item; // Delete temporary item
 }
 
 /*
@@ -390,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);
@@ -435,11 +449,16 @@ std::string RatSAO::getStaticData()
        return os.str();
 }
 
-InventoryItem* RatSAO::createPickedUpItem()
+void RatSAO::punch(ServerActiveObject *puncher)
 {
        std::istringstream is("CraftItem rat 1", std::ios_base::binary);
-       InventoryItem *item = InventoryItem::deSerialize(is);
-       return item;
+       IGameDef *gamedef = m_env->getGameDef();
+       InventoryItem *item = InventoryItem::deSerialize(is, gamedef);
+       bool fits = puncher->addToInventory(item);
+       if(fits)
+               m_removed = true;
+       else
+               delete item;
 }
 
 /*
@@ -622,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
@@ -684,9 +704,17 @@ std::string Oerkki1SAO::getStaticData()
        return os.str();
 }
 
-u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir,
-               const std::string &playername)
+void Oerkki1SAO::punch(ServerActiveObject *puncher)
 {
+       v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
+
+       std::string toolname = "";
+       InventoryItem *item = puncher->getWieldedItem();
+       if(item && (std::string)item->getName() == "ToolItem"){
+               ToolItem *titem = (ToolItem*)item;
+               toolname = titem->getToolName();
+       }
+
        m_speed_f += dir*12*BS;
 
        u16 amount = 5;
@@ -704,7 +732,8 @@ u16 Oerkki1SAO::punch(const std::string &toolname, v3f dir,
        if(toolname == "SteelPick")
                amount = 7;
        doDamage(amount);
-       return 65536/100;
+       
+       puncher->damageWieldedItem(65536/100);
 }
 
 void Oerkki1SAO::doDamage(u16 d)
@@ -861,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);
@@ -909,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;
 }
 
@@ -1351,10 +1382,20 @@ void MobV2SAO::step(float dtime, bool send_recommended)
        }
 }
 
-u16 MobV2SAO::punch(const std::string &toolname, v3f dir,
-               const std::string &playername)
+void MobV2SAO::punch(ServerActiveObject *puncher)
 {
-       assert(m_env);
+       v3f dir = (getBasePosition() - puncher->getBasePosition()).normalize();
+
+       std::string toolname = "";
+       InventoryItem *item = puncher->getWieldedItem();
+       if(item && (std::string)item->getName() == "ToolItem"){
+               ToolItem *titem = (ToolItem*)item;
+               toolname = titem->getToolName();
+       }
+       
+       // A quick hack; SAO description is player name for player
+       std::string playername = puncher->getDescription();
+
        Map *map = &m_env->getMap();
        
        actionstream<<playername<<" punches mob id="<<m_id
@@ -1396,7 +1437,8 @@ u16 MobV2SAO::punch(const std::string &toolname, v3f dir,
        if(toolname == "SteelPick")
                amount = 3;
        doDamage(amount);
-       return 65536/100;
+       
+       puncher->damageWieldedItem(65536/100);
 }
 
 bool MobV2SAO::isPeaceful()
@@ -1529,17 +1571,19 @@ LuaEntitySAO::~LuaEntitySAO()
        delete m_prop;
 }
 
-void LuaEntitySAO::addedToEnvironment(u16 id)
+void LuaEntitySAO::addedToEnvironment()
 {
-       ServerActiveObject::addedToEnvironment(id);
+       ServerActiveObject::addedToEnvironment();
        
        // Create entity from name and state
-       m_registered = true;
        lua_State *L = m_env->getLua();
-       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());
        
-       // Get properties
-       scriptapi_luaentity_get_properties(L, m_id, m_prop);
+       if(m_registered){
+               // Get properties
+               scriptapi_luaentity_get_properties(L, m_id, m_prop);
+       }
 }
 
 ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
@@ -1625,22 +1669,25 @@ 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;
 }
 
-u16 LuaEntitySAO::punch(const std::string &toolname, v3f dir,
-               const std::string &playername)
+void LuaEntitySAO::punch(ServerActiveObject *puncher)
 {
-       return 0;
+       if(!m_registered)
+               return;
+       lua_State *L = m_env->getLua();
+       scriptapi_luaentity_punch(L, m_id, puncher);
 }
 
-void LuaEntitySAO::rightClick(Player *player)
+void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
 {
        if(!m_registered)
                return;
        lua_State *L = m_env->getLua();
-       scriptapi_luaentity_rightclick_player(L, m_id, player->getName());
+       scriptapi_luaentity_rightclick(L, m_id, clicker);
 }
 
 void LuaEntitySAO::setPos(v3f pos)