Fix water-glass and water-lava surfaces
[oweals/minetest.git] / src / inventory.h
index 0e757a1e0334e8454d4eac1edb365af1ad9de668..490cab73ef9eb239ae43241cbdf0954c998b0ea6 100644 (file)
@@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include "common_irrlicht.h"
 #include "debug.h"
-#include "mapblockobject.h"
 #include "main.h" // For g_materials
 #include "mapnode.h" // For content_t
 
@@ -49,15 +48,21 @@ public:
        
        virtual const char* getName() const = 0;
        // Shall write the name and the parameters
-       virtual void serialize(std::ostream &os) = 0;
+       virtual void serialize(std::ostream &os) const = 0;
        // Shall make an exact clone of the item
        virtual InventoryItem* clone() = 0;
 #ifndef SERVER
-       // Shall return an image to show in the GUI (or NULL)
-       virtual video::ITexture * getImage() { return NULL; }
+       // Return the name of the image for this item
+       virtual std::string getBasename() const { return ""; }
+       // Shall return an image of the item (or NULL)
+       virtual video::ITexture * getImage() const { return NULL; }
+       // Shall return an image of the item without embellishments (or NULL)
+       virtual video::ITexture * getImageRaw() const { return getImage(); }
 #endif
        // Shall return a text to show in the GUI
        virtual std::string getText() { return ""; }
+       // Returns the string used for inventory
+       virtual std::string getItemString();
        // Creates an object from the item, to be placed in the world.
        virtual ServerActiveObject* createSAO(ServerEnvironment *env, u16 id, v3f pos);
        // Gets amount of items that dropping one SAO will decrement
@@ -133,7 +138,7 @@ public:
        {
                return "MaterialItem";
        }
-       virtual void serialize(std::ostream &os)
+       virtual void serialize(std::ostream &os) const
        {
                //os.imbue(std::locale("C"));
                os<<"MaterialItem2";
@@ -147,10 +152,9 @@ public:
                return new MaterialItem(m_content, m_count);
        }
 #ifndef SERVER
-       video::ITexture * getImage()
+       video::ITexture * getImage() const
        {
                return content_features(m_content).inventory_texture;
-               return NULL;
        }
 #endif
        std::string getText()
@@ -191,61 +195,6 @@ private:
        content_t m_content;
 };
 
-//TODO: Remove
-class MapBlockObjectItem : public InventoryItem
-{
-public:
-       MapBlockObjectItem(std::string inventorystring):
-               InventoryItem(1)
-       {
-               m_inventorystring = inventorystring;
-       }
-       
-       /*
-               Implementation interface
-       */
-       virtual const char* getName() const
-       {
-               return "MBOItem";
-       }
-       virtual void serialize(std::ostream &os)
-       {
-               for(;;)
-               {
-                       size_t t = m_inventorystring.find('|');
-                       if(t == std::string::npos)
-                               break;
-                       m_inventorystring[t] = '?';
-               }
-               os<<getName();
-               os<<" ";
-               os<<m_inventorystring;
-               os<<"|";
-       }
-       virtual InventoryItem* clone()
-       {
-               return new MapBlockObjectItem(m_inventorystring);
-       }
-
-#ifndef SERVER
-       video::ITexture * getImage();
-#endif
-       std::string getText();
-
-       /*
-               Special methods
-       */
-       std::string getInventoryString()
-       {
-               return m_inventorystring;
-       }
-
-       MapBlockObject * createObject(v3f pos, f32 player_yaw, f32 player_pitch);
-
-private:
-       std::string m_inventorystring;
-};
-
 /*
        An item that is used as a mid-product when crafting.
        Subnames:
@@ -266,7 +215,7 @@ public:
        {
                return "CraftItem";
        }
-       virtual void serialize(std::ostream &os)
+       virtual void serialize(std::ostream &os) const
        {
                os<<getName();
                os<<" ";
@@ -279,7 +228,7 @@ public:
                return new CraftItem(m_subname, m_count);
        }
 #ifndef SERVER
-       video::ITexture * getImage();
+       video::ITexture * getImage() const;
 #endif
        std::string getText()
        {
@@ -343,7 +292,7 @@ public:
        {
                return "ToolItem";
        }
-       virtual void serialize(std::ostream &os)
+       virtual void serialize(std::ostream &os) const
        {
                os<<getName();
                os<<" ";
@@ -356,40 +305,43 @@ public:
                return new ToolItem(m_toolname, m_wear);
        }
 #ifndef SERVER
-       video::ITexture * getImage()
-       {
-               if(g_texturesource == NULL)
-                       return NULL;
-               
-               std::string basename;
+       std::string getBasename() const {
                if(m_toolname == "WPick")
-                       basename = "tool_woodpick.png";
+                       return "tool_woodpick.png";
                else if(m_toolname == "STPick")
-                       basename = "tool_stonepick.png";
+                       return "tool_stonepick.png";
                else if(m_toolname == "SteelPick")
-                       basename = "tool_steelpick.png";
+                       return "tool_steelpick.png";
                else if(m_toolname == "MesePick")
-                       basename = "tool_mesepick.png";
+                       return "tool_mesepick.png";
                else if(m_toolname == "WShovel")
-                       basename = "tool_woodshovel.png";
+                       return "tool_woodshovel.png";
                else if(m_toolname == "STShovel")
-                       basename = "tool_stoneshovel.png";
+                       return "tool_stoneshovel.png";
                else if(m_toolname == "SteelShovel")
-                       basename = "tool_steelshovel.png";
+                       return "tool_steelshovel.png";
                else if(m_toolname == "WAxe")
-                       basename = "tool_woodaxe.png";
+                       return "tool_woodaxe.png";
                else if(m_toolname == "STAxe")
-                       basename = "tool_stoneaxe.png";
+                       return "tool_stoneaxe.png";
                else if(m_toolname == "SteelAxe")
-                       basename = "tool_steelaxe.png";
+                       return "tool_steelaxe.png";
                else if(m_toolname == "WSword")
-                       basename = "tool_woodsword.png";
+                       return "tool_woodsword.png";
                else if(m_toolname == "STSword")
-                       basename = "tool_stonesword.png";
+                       return "tool_stonesword.png";
                else if(m_toolname == "SteelSword")
-                       basename = "tool_steelsword.png";
+                       return "tool_steelsword.png";
                else
-                       basename = "cloud.png";
+                       return "cloud.png";
+}
+       
+       video::ITexture * getImage() const
+       {
+               if(g_texturesource == NULL)
+                       return NULL;
+               
+               std::string basename = getBasename();
                
                /*
                        Calculate a progress value with sane amount of
@@ -404,6 +356,14 @@ public:
 
                return g_texturesource->getTextureRaw(os.str());
        }
+
+       video::ITexture * getImageRaw() const
+       {
+               if(g_texturesource == NULL)
+                       return NULL;
+               
+               return g_texturesource->getTextureRaw(getBasename());
+       }
 #endif
        std::string getText()
        {
@@ -461,7 +421,7 @@ public:
        InventoryList(std::string name, u32 size);
        ~InventoryList();
        void clearItems();
-       void serialize(std::ostream &os);
+       void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 
        InventoryList(const InventoryList &other);
@@ -495,7 +455,13 @@ public:
        InventoryItem * addItem(u32 i, InventoryItem *newitem);
 
        // Checks whether the item could be added to the given slot
-       bool itemFits(u32 i, InventoryItem *newitem);
+       bool itemFits(const u32 i, const InventoryItem *newitem);
+
+       // Checks whether there is room for a given item
+       bool roomForItem(const InventoryItem *item);
+
+       // Checks whether there is room for a given item aftr it has been cooked
+       bool roomForCookedItem(const InventoryItem *item);
 
        // Takes some items from a slot.
        // If there are not enough, takes as many as it can.
@@ -525,7 +491,7 @@ public:
        Inventory(const Inventory &other);
        Inventory & operator = (const Inventory &other);
        
-       void serialize(std::ostream &os);
+       void serialize(std::ostream &os) const;
        void deSerialize(std::istream &is);
 
        InventoryList * addList(const std::string &name, u32 size);
@@ -591,7 +557,7 @@ struct InventoryAction
        static InventoryAction * deSerialize(std::istream &is);
        
        virtual u16 getType() const = 0;
-       virtual void serialize(std::ostream &os) = 0;
+       virtual void serialize(std::ostream &os) const = 0;
        virtual void apply(InventoryContext *c, InventoryManager *mgr) = 0;
 };
 
@@ -639,7 +605,7 @@ struct IMoveAction : public InventoryAction
                return IACTION_MOVE;
        }
 
-       void serialize(std::ostream &os)
+       void serialize(std::ostream &os) const
        {
                os<<"Move ";
                os<<count<<" ";