Improve glass
[oweals/minetest.git] / src / inventory.cpp
index f9b9107a0e0d860ed2ecb4a17e571c112731abf2..1929761a58213897a00fa4637f08df0784f4c6af 100644 (file)
@@ -1,6 +1,6 @@
 /*
 Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,31 +17,50 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-/*
-(c) 2010 Perttu Ahola <celeron55@gmail.com>
-*/
-
 #include "inventory.h"
 #include "serialization.h"
 #include "utility.h"
 #include "debug.h"
 #include <sstream>
-#include "main.h"
+#include "main.h" // For tsrc, g_toolmanager
+#include "serverobject.h"
+#include "content_mapnode.h"
+#include "content_inventory.h"
+#include "content_sao.h"
+#include "player.h"
+#include "log.h"
+#include "nodedef.h"
+#include "tooldef.h"
+#include "gamedef.h"
 
 /*
        InventoryItem
 */
 
-InventoryItem::InventoryItem(u16 count)
+InventoryItem::InventoryItem(IGameDef *gamedef, u16 count):
+       m_gamedef(gamedef),
+       m_count(count)
 {
-       m_count = count;
+       assert(m_gamedef);
 }
 
 InventoryItem::~InventoryItem()
 {
 }
 
-InventoryItem* InventoryItem::deSerialize(std::istream &is)
+content_t content_translate_from_19_to_internal(content_t c_from)
+{
+       for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
+       {
+               if(trans_table_19[i][1] == c_from)
+               {
+                       return trans_table_19[i][0];
+               }
+       }
+       return c_from;
+}
+
+InventoryItem* InventoryItem::deSerialize(std::istream &is, IGameDef *gamedef)
 {
        DSTACK(__FUNCTION_NAME);
 
@@ -57,15 +76,30 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
                is>>material;
                u16 count;
                is>>count;
-               if(material > 255)
+               // Convert old materials
+               if(material <= 0xff)
+               {
+                       material = content_translate_from_19_to_internal(material);
+               }
+               if(material > MAX_CONTENT)
+                       throw SerializationError("Too large material number");
+               return new MaterialItem(gamedef, material, count);
+       }
+       else if(name == "MaterialItem2")
+       {
+               u16 material;
+               is>>material;
+               u16 count;
+               is>>count;
+               if(material > MAX_CONTENT)
                        throw SerializationError("Too large material number");
-               return new MaterialItem(material, count);
+               return new MaterialItem(gamedef, material, count);
        }
        else if(name == "MBOItem")
        {
                std::string inventorystring;
                std::getline(is, inventorystring, '|');
-               return new MapBlockObjectItem(inventorystring);
+               throw SerializationError("MBOItem not supported anymore");
        }
        else if(name == "CraftItem")
        {
@@ -73,7 +107,7 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
                std::getline(is, subname, ' ');
                u16 count;
                is>>count;
-               return new CraftItem(subname, count);
+               return new CraftItem(gamedef, subname, count);
        }
        else if(name == "ToolItem")
        {
@@ -81,135 +115,162 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
                std::getline(is, toolname, ' ');
                u16 wear;
                is>>wear;
-               return new ToolItem(toolname, wear);
+               return new ToolItem(gamedef, toolname, wear);
        }
        else
        {
-               dstream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
+               infostream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
                throw SerializationError("Unknown InventoryItem name");
        }
 }
 
+std::string InventoryItem::getItemString() {
+       // Get item string
+       std::ostringstream os(std::ios_base::binary);
+       serialize(os);
+       return os.str();
+}
+
+ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
+{
+       /*
+               Create an ItemSAO
+       */
+       pos.Y -= BS*0.25; // let it drop a bit
+       // Randomize a bit
+       pos.X += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
+       pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
+       // Create object
+       ServerActiveObject *obj = new ItemSAO(env, pos, getItemString());
+       return obj;
+}
+
 /*
        MaterialItem
 */
 
-bool MaterialItem::isCookable()
+#ifndef SERVER
+video::ITexture * MaterialItem::getImage(ITextureSource *tsrc) const
 {
-       if(m_content == CONTENT_TREE)
-       {
-               return true;
-       }
-       else if(m_content == CONTENT_COBBLE)
-       {
-               return true;
-       }
-       return false;
+       return m_gamedef->getNodeDefManager()->get(m_content).inventory_texture;
 }
+#endif
 
-InventoryItem *MaterialItem::createCookResult()
+bool MaterialItem::isCookable() const
 {
-       if(m_content == CONTENT_TREE)
-       {
-               return new CraftItem("lump_of_coal", 1);
-       }
-       else if(m_content == CONTENT_COBBLE)
-       {
-               return new MaterialItem(CONTENT_STONE, 1);
-       }
-       return NULL;
+       return item_material_is_cookable(m_content, m_gamedef);
+}
+
+InventoryItem *MaterialItem::createCookResult() const
+{
+       return item_material_create_cook_result(m_content, m_gamedef);
 }
 
 /*
-       CraftItem
+       ToolItem
 */
 
-bool CraftItem::isCookable()
+std::string ToolItem::getImageBasename() const
 {
-       if(m_subname == "lump_of_iron")
-       {
-               return true;
-       }
-       return false;
+       return m_gamedef->getToolDefManager()->getImagename(m_toolname);
 }
 
-InventoryItem *CraftItem::createCookResult()
+#ifndef SERVER
+video::ITexture * ToolItem::getImage(ITextureSource *tsrc) const
 {
-       if(m_subname == "lump_of_iron")
-       {
-               return new CraftItem("steel_ingot", 1);
-       }
-       return NULL;
+       if(tsrc == NULL)
+               return NULL;
+       
+       std::string basename = getImageBasename();
+       
+       /*
+               Calculate a progress value with sane amount of
+               maximum states
+       */
+       u32 maxprogress = 30;
+       u32 toolprogress = (65535-m_wear)/(65535/maxprogress);
+       
+       float value_f = (float)toolprogress / (float)maxprogress;
+       std::ostringstream os;
+       os<<basename<<"^[progressbar"<<value_f;
+
+       return tsrc->getTextureRaw(os.str());
 }
 
+video::ITexture * ToolItem::getImageRaw(ITextureSource *tsrc) const
+{
+       if(tsrc == NULL)
+               return NULL;
+       
+       return tsrc->getTextureRaw(getImageBasename());
+}
+#endif
+
 /*
-       MapBlockObjectItem
+       CraftItem
 */
+
 #ifndef SERVER
-video::ITexture * MapBlockObjectItem::getImage()
+video::ITexture * CraftItem::getImage(ITextureSource *tsrc) const
 {
-       if(m_inventorystring.substr(0,3) == "Rat")
-               return g_texturesource->getTextureRaw("rat.png");
+       if(tsrc == NULL)
+               return NULL;
        
-       if(m_inventorystring.substr(0,4) == "Sign")
-               return g_texturesource->getTextureRaw("sign.png");
+       std::string name = item_craft_get_image_name(m_subname, m_gamedef);
 
-       return NULL;
+       // Get such a texture
+       return tsrc->getTextureRaw(name);
 }
 #endif
-std::string MapBlockObjectItem::getText()
+
+ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
 {
-       if(m_inventorystring.substr(0,3) == "Rat")
-               return "";
-       
-       if(m_inventorystring.substr(0,4) == "Sign")
-               return "";
+       // Special cases
+       ServerActiveObject *obj = item_craft_create_object(m_subname, env, pos);
+       if(obj)
+               return obj;
+       // Default
+       return InventoryItem::createSAO(env, id, pos);
+}
 
-       return "obj";
+u16 CraftItem::getDropCount() const
+{
+       // Special cases
+       s16 dc = item_craft_get_drop_count(m_subname, m_gamedef);
+       if(dc != -1)
+               return dc;
+       // Default
+       return InventoryItem::getDropCount();
 }
 
-MapBlockObject * MapBlockObjectItem::createObject
-               (v3f pos, f32 player_yaw, f32 player_pitch)
+bool CraftItem::isCookable() const
 {
-       std::istringstream is(m_inventorystring);
-       std::string name;
-       std::getline(is, name, ' ');
+       return item_craft_is_cookable(m_subname, m_gamedef);
+}
+
+InventoryItem *CraftItem::createCookResult() const
+{
+       return item_craft_create_cook_result(m_subname, m_gamedef);
+}
+
+bool CraftItem::use(ServerEnvironment *env, ServerActiveObject *user)
+{
+       if(!item_craft_is_eatable(m_subname, m_gamedef))
+               return false;
        
-       if(name == "None")
-       {
-               return NULL;
-       }
-       else if(name == "Sign")
-       {
-               std::string text;
-               std::getline(is, text, '|');
-               SignObject *obj = new SignObject(NULL, -1, pos);
-               obj->setText(text);
-               obj->setYaw(-player_yaw);
-               return obj;
-       }
-       else if(name == "Rat")
-       {
-               RatObject *obj = new RatObject(NULL, -1, pos);
-               return obj;
-       }
-       else if(name == "ItemObj")
-       {
-               /*
-                       Now we are an inventory item containing the serialization
-                       string of an object that contains the serialization
-                       string of an inventory item. Fuck this.
-               */
-               //assert(0);
-               dstream<<__FUNCTION_NAME<<": WARNING: Ignoring ItemObj "
-                               <<"because an item-object should never be inside "
-                               <<"an object-item."<<std::endl;
-               return NULL;
-       }
-       else
-       {
-               return NULL;
-       }
+       u16 result_count = getCount() - 1; // Eat one at a time
+       s16 hp_change = item_craft_eat_hp_change(m_subname, m_gamedef);
+       s16 hp = user->getHP();
+       hp += hp_change;
+       if(hp < 0)
+               hp = 0;
+       user->setHP(hp);
+       
+       if(result_count < 1)
+               return true;
+               
+       setCount(result_count);
+       return false;
 }
 
 /*
@@ -221,6 +282,7 @@ InventoryList::InventoryList(std::string name, u32 size)
        m_name = name;
        m_size = size;
        clearItems();
+       //m_dirty = false;
 }
 
 InventoryList::~InventoryList()
@@ -246,9 +308,11 @@ void InventoryList::clearItems()
        {
                m_items.push_back(NULL);
        }
+
+       //setDirty(true);
 }
 
-void InventoryList::serialize(std::ostream &os)
+void InventoryList::serialize(std::ostream &os) const
 {
        //os.imbue(std::locale("C"));
        
@@ -270,7 +334,7 @@ void InventoryList::serialize(std::ostream &os)
        os<<"EndInventoryList\n";
 }
 
-void InventoryList::deSerialize(std::istream &is)
+void InventoryList::deSerialize(std::istream &is, IGameDef *gamedef)
 {
        //is.imbue(std::locale("C"));
 
@@ -301,7 +365,7 @@ void InventoryList::deSerialize(std::istream &is)
                {
                        if(item_i > getSize() - 1)
                                throw SerializationError("too many items");
-                       InventoryItem *item = InventoryItem::deSerialize(iss);
+                       InventoryItem *item = InventoryItem::deSerialize(iss, gamedef);
                        m_items[item_i++] = item;
                }
                else if(name == "Empty")
@@ -339,11 +403,12 @@ InventoryList & InventoryList::operator = (const InventoryList &other)
                        m_items[i] = item->clone();
                }
        }
+       //setDirty(true);
 
        return *this;
 }
 
-std::string InventoryList::getName()
+const std::string &InventoryList::getName() const
 {
        return m_name;
 }
@@ -370,6 +435,13 @@ u32 InventoryList::getFreeSlots()
        return getSize() - getUsedSlots();
 }
 
+const InventoryItem * InventoryList::getItem(u32 i) const
+{
+       if(i > m_items.size() - 1)
+               return NULL;
+       return m_items[i];
+}
+
 InventoryItem * InventoryList::getItem(u32 i)
 {
        if(i > m_items.size() - 1)
@@ -383,6 +455,7 @@ InventoryItem * InventoryList::changeItem(u32 i, InventoryItem *newitem)
 
        InventoryItem *olditem = m_items[i];
        m_items[i] = newitem;
+       //setDirty(true);
        return olditem;
 }
 
@@ -436,8 +509,10 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem)
        if(newitem == NULL)
                return NULL;
        
+       //setDirty(true);
+       
        // If it is an empty position, it's an easy job.
-       InventoryItem *to_item = m_items[i];
+       InventoryItem *to_item = getItem(i);
        if(to_item == NULL)
        {
                m_items[i] = newitem;
@@ -466,20 +541,20 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem)
        }
 }
 
-bool InventoryList::itemFits(u32 i, InventoryItem *newitem)
+bool InventoryList::itemFits(const u32 i, const InventoryItem *newitem)
 {
        // If it is an empty position, it's an easy job.
-       InventoryItem *to_item = m_items[i];
+       const InventoryItem *to_item = getItem(i);
        if(to_item == NULL)
        {
                return true;
        }
        
-       // If not addable, return the item
+       // If not addable, fail
        if(newitem->addableTo(to_item) == false)
                return false;
        
-       // If the item fits fully in the slot, add counter and delete it
+       // If the item fits fully in the slot, pass
        if(newitem->getCount() <= to_item->freeSpace())
        {
                return true;
@@ -488,12 +563,34 @@ bool InventoryList::itemFits(u32 i, InventoryItem *newitem)
        return false;
 }
 
+bool InventoryList::roomForItem(const InventoryItem *item)
+{
+       for(u32 i=0; i<m_items.size(); i++)
+               if(itemFits(i, item))
+                       return true;
+       return false;
+}
+
+bool InventoryList::roomForCookedItem(const InventoryItem *item)
+{
+       if(!item)
+               return false;
+       const InventoryItem *cook = item->createCookResult();
+       if(!cook)
+               return false;
+       bool room = roomForItem(cook);
+       delete cook;
+       return room;
+}
+
 InventoryItem * InventoryList::takeItem(u32 i, u32 count)
 {
        if(count == 0)
                return NULL;
+       
+       //setDirty(true);
 
-       InventoryItem *item = m_items[i];
+       InventoryItem *item = getItem(i);
        // If it is an empty position, return NULL
        if(item == NULL)
                return NULL;
@@ -576,7 +673,7 @@ Inventory & Inventory::operator = (const Inventory &other)
        return *this;
 }
 
-void Inventory::serialize(std::ostream &os)
+void Inventory::serialize(std::ostream &os) const
 {
        for(u32 i=0; i<m_lists.size(); i++)
        {
@@ -588,7 +685,7 @@ void Inventory::serialize(std::ostream &os)
        os<<"EndInventory\n";
 }
 
-void Inventory::deSerialize(std::istream &is)
+void Inventory::deSerialize(std::istream &is, IGameDef *gamedef)
 {
        clear();
 
@@ -620,7 +717,7 @@ void Inventory::deSerialize(std::istream &is)
                        iss>>listsize;
 
                        InventoryList *list = new InventoryList(listname, listsize);
-                       list->deSerialize(is);
+                       list->deSerialize(is, gamedef);
 
                        m_lists.push_back(list);
                }
@@ -658,7 +755,15 @@ InventoryList * Inventory::getList(const std::string &name)
        return m_lists[i];
 }
 
-s32 Inventory::getListIndex(const std::string &name)
+const InventoryList * Inventory::getList(const std::string &name) const
+{
+       s32 i = getListIndex(name);
+       if(i == -1)
+               return NULL;
+       return m_lists[i];
+}
+
+const s32 Inventory::getListIndex(const std::string &name) const
 {
        for(u32 i=0; i<m_lists.size(); i++)
        {
@@ -687,51 +792,78 @@ InventoryAction * InventoryAction::deSerialize(std::istream &is)
        return a;
 }
 
-void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+static std::string describeC(const struct InventoryContext *c)
 {
-#if 1
+       if(c->current_player == NULL)
+               return "current_player=NULL";
+       else
+               return std::string("current_player=") + c->current_player->getName();
+}
+
+IMoveAction::IMoveAction(std::istream &is)
+{
+       std::string ts;
+
+       std::getline(is, ts, ' ');
+       count = stoi(ts);
 
-       /*dstream<<"from_inv="<<from_inv<<" to_inv="<<to_inv<<std::endl;
-       dstream<<"from_list="<<from_list<<" to_list="<<to_list<<std::endl;
-       dstream<<"from_i="<<from_i<<" to_i="<<to_i<<std::endl;*/
+       std::getline(is, from_inv, ' ');
 
+       std::getline(is, from_list, ' ');
+
+       std::getline(is, ts, ' ');
+       from_i = stoi(ts);
+
+       std::getline(is, to_inv, ' ');
+
+       std::getline(is, to_list, ' ');
+
+       std::getline(is, ts, ' ');
+       to_i = stoi(ts);
+}
+
+void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+{
        Inventory *inv_from = mgr->getInventory(c, from_inv);
        Inventory *inv_to = mgr->getInventory(c, to_inv);
-
-       if(!inv_from || !inv_to)
-       {
-               dstream<<__FUNCTION_NAME<<": Operation not allowed "
-                               <<"(inventories not found)"<<std::endl;
+       
+       if(!inv_from){
+               infostream<<"IMoveAction::apply(): FAIL: source inventory not found: "
+                               <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+                               <<", to_inv=\""<<to_inv<<"\""<<std::endl;
+               return;
+       }
+       if(!inv_to){
+               infostream<<"IMoveAction::apply(): FAIL: destination inventory not found: "
+                               "context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+                               <<", to_inv=\""<<to_inv<<"\""<<std::endl;
                return;
        }
 
        InventoryList *list_from = inv_from->getList(from_list);
        InventoryList *list_to = inv_to->getList(to_list);
 
-       /*dstream<<"list_from="<<list_from<<" list_to="<<list_to
-                       <<std::endl;*/
-       /*if(list_from)
-               dstream<<" list_from->getItem(from_i)="<<list_from->getItem(from_i)
-                               <<std::endl;
-       if(list_to)
-               dstream<<" list_to->getItem(to_i)="<<list_to->getItem(to_i)
-                               <<std::endl;*/
-       
        /*
                If a list doesn't exist or the source item doesn't exist
        */
-       if(!list_from || !list_to)
-       {
-               dstream<<__FUNCTION_NAME<<": Operation not allowed "
-                               <<"(a list doesn't exist)"
-                               <<std::endl;
+       if(!list_from){
+               infostream<<"IMoveAction::apply(): FAIL: source list not found: "
+                               <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+                               <<", from_list=\""<<from_list<<"\""<<std::endl;
+               return;
+       }
+       if(!list_to){
+               infostream<<"IMoveAction::apply(): FAIL: destination list not found: "
+                               <<"context=["<<describeC(c)<<"], to_inv=\""<<to_inv<<"\""
+                               <<", to_list=\""<<to_list<<"\""<<std::endl;
                return;
        }
        if(list_from->getItem(from_i) == NULL)
        {
-               dstream<<__FUNCTION_NAME<<": Operation not allowed "
-                               <<"(the source item doesn't exist)"
-                               <<std::endl;
+               infostream<<"IMoveAction::apply(): FAIL: source item not found: "
+                               <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+                               <<", from_list=\""<<from_list<<"\""
+                               <<" from_i="<<from_i<<std::endl;
                return;
        }
        /*
@@ -739,8 +871,9 @@ void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
        */
        if(inv_from == inv_to && list_from == list_to && from_i == to_i)
        {
-               dstream<<__FUNCTION_NAME<<": Operation not allowed "
-                               <<"(source and the destination slots are the same)"<<std::endl;
+               infostream<<"IMoveAction::apply(): FAIL: source and destination slots "
+                               <<"are the same: inv=\""<<from_inv<<"\" list=\""<<from_list
+                               <<"\" i="<<from_i<<std::endl;
                return;
        }
        
@@ -781,14 +914,23 @@ void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
        mgr->inventoryModified(c, from_inv);
        if(from_inv != to_inv)
                mgr->inventoryModified(c, to_inv);
-#endif
+       
+       infostream<<"IMoveAction::apply(): moved at "
+                       <<"["<<describeC(c)<<"]"
+                       <<" from inv=\""<<from_inv<<"\""
+                       <<" list=\""<<from_list<<"\""
+                       <<" i="<<from_i
+                       <<" to inv=\""<<to_inv<<"\""
+                       <<" list=\""<<to_list<<"\""
+                       <<" i="<<to_i
+                       <<std::endl;
 }
 
 /*
        Craft checking system
 */
 
-bool ItemSpec::checkItem(InventoryItem *item)
+bool ItemSpec::checkItem(const InventoryItem *item) const
 {
        if(type == ITEM_NONE)
        {
@@ -838,7 +980,7 @@ bool ItemSpec::checkItem(InventoryItem *item)
        return true;
 }
 
-bool checkItemCombination(InventoryItem **items, ItemSpec *specs)
+bool checkItemCombination(InventoryItem const * const *items, const ItemSpec *specs)
 {
        u16 items_min_x = 100;
        u16 items_max_x = 100;
@@ -901,8 +1043,8 @@ bool checkItemCombination(InventoryItem **items, ItemSpec *specs)
                u16 items_y = items_min_y + y;
                u16 specs_x = specs_min_x + x;
                u16 specs_y = specs_min_y + y;
-               InventoryItem *item = items[items_y * 3 + items_x];
-               ItemSpec &spec = specs[specs_y * 3 + specs_x];
+               const InventoryItem *item = items[items_y * 3 + items_x];
+               const ItemSpec &spec = specs[specs_y * 3 + specs_x];
 
                if(spec.checkItem(item) == false)
                        return false;