mobv2

[minetest.git] / src / inventory.cpp

diff --git a/src/inventory.cpp b/src/inventory.cpp
index 62aedb536aee407b4309706c8b4b8c1b2c36c3aa..b8afbc81f32b3f60b8d897f5cded51014af43cf7 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -97,7 +97,7 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
        {
                std::string inventorystring;
                std::getline(is, inventorystring, '|');
-               return new MapBlockObjectItem(inventorystring);
+               throw SerializationError("MBOItem not supported anymore");
        }
        else if(name == "CraftItem")
        {
@@ -122,16 +122,20 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
        }
 }
 
+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
        */
-       // Get item string
-       std::ostringstream os(std::ios_base::binary);
-       serialize(os);
        // Create object
-       ServerActiveObject *obj = new ItemSAO(env, 0, pos, os.str());
+       ServerActiveObject *obj = new ItemSAO(env, 0, pos, getItemString());
        return obj;
 }
 
@@ -154,7 +158,7 @@ InventoryItem *MaterialItem::createCookResult() const
 */
 
 #ifndef SERVER
-video::ITexture * CraftItem::getImage()
+video::ITexture * CraftItem::getImage() const
 {
        if(g_texturesource == NULL)
                return NULL;
@@ -200,87 +204,21 @@ bool CraftItem::use(ServerEnvironment *env, Player *player)
 {
        if(item_craft_is_eatable(m_subname))
        {
+               u16 result_count = getCount() - 1; // Eat one at a time
                s16 hp_change = item_craft_eat_hp_change(m_subname);
                if(player->hp + hp_change > 20)
                        player->hp = 20;
                else
                        player->hp += hp_change;
-               return true;
+               
+               if(result_count < 1)
+                       return true;
+               else
+                       setCount(result_count);
        }
        return false;
 }
 
-/*
-       MapBlockObjectItem DEPRECATED
-       TODO: Remove
-*/
-#ifndef SERVER
-video::ITexture * MapBlockObjectItem::getImage()
-{
-       if(m_inventorystring.substr(0,3) == "Rat")
-               return g_texturesource->getTextureRaw("rat.png");
-       
-       if(m_inventorystring.substr(0,4) == "Sign")
-               return g_texturesource->getTextureRaw("sign.png");
-
-       return NULL;
-}
-#endif
-std::string MapBlockObjectItem::getText()
-{
-       if(m_inventorystring.substr(0,3) == "Rat")
-               return "";
-       
-       if(m_inventorystring.substr(0,4) == "Sign")
-               return "";
-
-       return "obj";
-}
-
-MapBlockObject * MapBlockObjectItem::createObject
-               (v3f pos, f32 player_yaw, f32 player_pitch)
-{
-       std::istringstream is(m_inventorystring);
-       std::string name;
-       std::getline(is, name, ' ');
-       
-       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;
-       }
-}
-
 /*
        Inventory
 */
@@ -581,6 +519,8 @@ bool InventoryList::roomForItem(const InventoryItem *item)
 
 bool InventoryList::roomForCookedItem(const InventoryItem *item)
 {
+       if(!item)
+               return false;
        const InventoryItem *cook = item->createCookResult();
        if(!cook)
                return false;