map unloading is now a whole lot better

[dragonfireclient.git] / src / inventory.cpp

diff --git a/src/inventory.cpp b/src/inventory.cpp
index b14828ae22ba3250c9aee688cee40c4434a38137..fec51a759e581617db89f43eef9bb494ef82f949 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -28,6 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 #include "main.h"
 #include "serverobject.h"
+#include "content_mapnode.h"
+#include "content_inventory.h"
+#include "content_sao.h"
 
 /*
        InventoryItem
@@ -110,28 +113,12 @@ ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f
 
 bool MaterialItem::isCookable()
 {
-       if(m_content == CONTENT_TREE)
-       {
-               return true;
-       }
-       else if(m_content == CONTENT_COBBLE)
-       {
-               return true;
-       }
-       return false;
+       return item_material_is_cookable(m_content);
 }
 
 InventoryItem *MaterialItem::createCookResult()
 {
-       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_create_cook_result(m_content);
 }
 
 /*
@@ -144,23 +131,9 @@ video::ITexture * CraftItem::getImage()
        if(g_texturesource == NULL)
                return NULL;
        
-       std::string name;
+       std::string name = item_craft_get_image_name(m_subname);
 
-       if(m_subname == "Stick")
-               name = "stick.png";
-       else if(m_subname == "lump_of_coal")
-               name = "lump_of_coal.png";
-       else if(m_subname == "lump_of_iron")
-               name = "lump_of_iron.png";
-       else if(m_subname == "steel_ingot")
-               name = "steel_ingot.png";
-       else if(m_subname == "rat")
-               name = "rat.png";
-       else
-               name = "cloud.png";
-       
        // Get such a texture
-       //return g_irrlicht->getTexture(name);
        return g_texturesource->getTextureRaw(name);
 }
 #endif
@@ -168,38 +141,35 @@ video::ITexture * CraftItem::getImage()
 ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
 {
        // Special cases
-       if(m_subname == "rat")
-       {
-               ServerActiveObject *obj = new RatSAO(env, id, pos);
+       ServerActiveObject *obj = item_craft_create_object(m_subname, env, id, pos);
+       if(obj)
                return obj;
-       }
        // Default
-       else
-       {
-               return InventoryItem::createSAO(env, id, pos);
-       }
+       return InventoryItem::createSAO(env, id, pos);
+}
+
+u16 CraftItem::getDropCount()
+{
+       // Special cases
+       s16 dc = item_craft_get_drop_count(m_subname);
+       if(dc != -1)
+               return dc;
+       // Default
+       return InventoryItem::getDropCount();
 }
 
 bool CraftItem::isCookable()
 {
-       if(m_subname == "lump_of_iron")
-       {
-               return true;
-       }
-       return false;
+       return item_craft_is_cookable(m_subname);
 }
 
 InventoryItem *CraftItem::createCookResult()
 {
-       if(m_subname == "lump_of_iron")
-       {
-               return new CraftItem("steel_ingot", 1);
-       }
-       return NULL;
+       return item_craft_create_cook_result(m_subname);
 }
 
 /*
-       MapBlockObjectItem
+       MapBlockObjectItem DEPRECATED
        TODO: Remove
 */
 #ifndef SERVER
@@ -278,6 +248,7 @@ InventoryList::InventoryList(std::string name, u32 size)
        m_name = name;
        m_size = size;
        clearItems();
+       //m_dirty = false;
 }
 
 InventoryList::~InventoryList()
@@ -303,6 +274,8 @@ void InventoryList::clearItems()
        {
                m_items.push_back(NULL);
        }
+
+       //setDirty(true);
 }
 
 void InventoryList::serialize(std::ostream &os)
@@ -396,6 +369,7 @@ InventoryList & InventoryList::operator = (const InventoryList &other)
                        m_items[i] = item->clone();
                }
        }
+       //setDirty(true);
 
        return *this;
 }
@@ -440,6 +414,7 @@ InventoryItem * InventoryList::changeItem(u32 i, InventoryItem *newitem)
 
        InventoryItem *olditem = m_items[i];
        m_items[i] = newitem;
+       //setDirty(true);
        return olditem;
 }
 
@@ -493,8 +468,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;
@@ -526,7 +503,7 @@ InventoryItem * InventoryList::addItem(u32 i, InventoryItem *newitem)
 bool InventoryList::itemFits(u32 i, InventoryItem *newitem)
 {
        // 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)
        {
                return true;
@@ -549,8 +526,10 @@ 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;