map unloading is now a whole lot better

[dragonfireclient.git] / src / inventory.cpp

diff --git a/src/inventory.cpp b/src/inventory.cpp
index 86e00877c96054eb1e9001599d5da0bfb660192a..fec51a759e581617db89f43eef9bb494ef82f949 100644 (file)
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -27,6 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "debug.h"
 #include <sstream>
 #include "main.h"
+#include "serverobject.h"
+#include "content_mapnode.h"
+#include "content_inventory.h"
+#include "content_sao.h"
 
 /*
        InventoryItem
@@ -90,8 +94,83 @@ InventoryItem* InventoryItem::deSerialize(std::istream &is)
        }
 }
 
+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());
+       return obj;
+}
+
+/*
+       MaterialItem
+*/
+
+bool MaterialItem::isCookable()
+{
+       return item_material_is_cookable(m_content);
+}
+
+InventoryItem *MaterialItem::createCookResult()
+{
+       return item_material_create_cook_result(m_content);
+}
+
+/*
+       CraftItem
+*/
+
+#ifndef SERVER
+video::ITexture * CraftItem::getImage()
+{
+       if(g_texturesource == NULL)
+               return NULL;
+       
+       std::string name = item_craft_get_image_name(m_subname);
+
+       // Get such a texture
+       return g_texturesource->getTextureRaw(name);
+}
+#endif
+
+ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
+{
+       // Special cases
+       ServerActiveObject *obj = item_craft_create_object(m_subname, env, id, pos);
+       if(obj)
+               return obj;
+       // Default
+       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()
+{
+       return item_craft_is_cookable(m_subname);
+}
+
+InventoryItem *CraftItem::createCookResult()
+{
+       return item_craft_create_cook_result(m_subname);
+}
+
 /*
-       MapBlockObjectItem
+       MapBlockObjectItem DEPRECATED
+       TODO: Remove
 */
 #ifndef SERVER
 video::ITexture * MapBlockObjectItem::getImage()
@@ -169,6 +248,7 @@ InventoryList::InventoryList(std::string name, u32 size)
        m_name = name;
        m_size = size;
        clearItems();
+       //m_dirty = false;
 }
 
 InventoryList::~InventoryList()
@@ -194,6 +274,8 @@ void InventoryList::clearItems()
        {
                m_items.push_back(NULL);
        }
+
+       //setDirty(true);
 }
 
 void InventoryList::serialize(std::ostream &os)
@@ -287,6 +369,7 @@ InventoryList & InventoryList::operator = (const InventoryList &other)
                        m_items[i] = item->clone();
                }
        }
+       //setDirty(true);
 
        return *this;
 }
@@ -313,6 +396,11 @@ u32 InventoryList::getUsedSlots()
        return num;
 }
 
+u32 InventoryList::getFreeSlots()
+{
+       return getSize() - getUsedSlots();
+}
+
 InventoryItem * InventoryList::getItem(u32 i)
 {
        if(i > m_items.size() - 1)
@@ -326,6 +414,7 @@ InventoryItem * InventoryList::changeItem(u32 i, InventoryItem *newitem)
 
        InventoryItem *olditem = m_items[i];
        m_items[i] = newitem;
+       //setDirty(true);
        return olditem;
 }
 
@@ -339,6 +428,9 @@ void InventoryList::deleteItem(u32 i)
 
 InventoryItem * InventoryList::addItem(InventoryItem *newitem)
 {
+       if(newitem == NULL)
+               return NULL;
+       
        /*
                First try to find if it could be added to some existing items
        */
@@ -373,8 +465,13 @@ InventoryItem * InventoryList::addItem(InventoryItem *newitem)
 
 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;
@@ -406,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;
@@ -429,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;