comment update

[oweals/minetest.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index 3ba655880667f4a880bc03d423944d211a011e76..07d81a3f7eecb77c8575616bd87a763d447357f4 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -59,6 +59,8 @@ public:
        virtual std::string getText() { return ""; }
        // 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
+       virtual u16 getDropCount(){ return getCount(); }
 
        /*
                Quantity methods
@@ -279,6 +281,7 @@ public:
        }
 
        ServerActiveObject* createSAO(ServerEnvironment *env, u16 id, v3f pos);
+       u16 getDropCount();
 
        virtual bool addableTo(InventoryItem *other)
        {
@@ -366,6 +369,12 @@ public:
                        basename = "tool_stoneaxe.png";
                else if(m_toolname == "SteelAxe")
                        basename = "tool_steelaxe.png";
+               else if(m_toolname == "WSword")
+                       basename = "tool_woodsword.png";
+               else if(m_toolname == "STSword")
+                       basename = "tool_stonesword.png";
+               else if(m_toolname == "SteelSword")
+                       basename = "tool_steelsword.png";
                else
                        basename = "cloud.png";
                
@@ -381,11 +390,6 @@ public:
                os<<basename<<"^[progressbar"<<value_f;
 
                return g_texturesource->getTextureRaw(os.str());
-
-               /*TextureSpec spec;
-               spec.addTid(g_irrlicht->getTextureId(basename));
-               spec.addTid(g_irrlicht->getTextureId(os.str()));
-               return g_irrlicht->getTexture(spec);*/
        }
 #endif
        std::string getText()
@@ -455,6 +459,9 @@ public:
        // Count used slots
        u32 getUsedSlots();
        u32 getFreeSlots();
+
+       /*bool getDirty(){ return m_dirty; }
+       void setDirty(bool dirty=true){ m_dirty = dirty; }*/
        
        // Get pointer to item
        InventoryItem * getItem(u32 i);
@@ -490,6 +497,7 @@ private:
        core::array<InventoryItem*> m_items;
        u32 m_size;
        std::string m_name;
+       //bool m_dirty;
 };
 
 class Inventory