Modernize various files (part 2)

[dragonfireclient.git] / src / inventory.h

diff --git a/src/inventory.h b/src/inventory.h
index e3c994fc3db9f8eb6f97379c1b5b62cc4ec17b4e..aff0ce20fea4de7ca81ada6d6daf91a59ecedd95 100644 (file)
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -17,12 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef INVENTORY_HEADER
-#define INVENTORY_HEADER
+#pragma once
 
 #include "debug.h"
 #include "itemdef.h"
 #include "irrlichttypes.h"
+#include "itemstackmetadata.h"
 #include <istream>
 #include <ostream>
 #include <string>
@@ -32,10 +32,10 @@ struct ToolCapabilities;
 
 struct ItemStack
 {
-       ItemStack(): name(""), count(0), wear(0), metadata("") {}
-       ItemStack(std::string name_, u16 count_,
-                       u16 wear, std::string metadata_,
-                       IItemDefManager *itemdef);
+       ItemStack() {}
+       ItemStack(const std::string &name_, u16 count_,
+                       u16 wear, IItemDefManager *itemdef);
+
        ~ItemStack() {}
 
        // Serialization
@@ -61,7 +61,7 @@ struct ItemStack
                name = "";
                count = 0;
                wear = 0;
-               metadata = "";
+               metadata.clear();
        }
 
        void add(u16 n)
@@ -80,15 +80,14 @@ struct ItemStack
        // Maximum size of a stack
        u16 getStackMax(IItemDefManager *itemdef) const
        {
-               s16 max = itemdef->get(name).stack_max;
-               return (max >= 0) ? max : 0;
+               return itemdef->get(name).stack_max;
        }
 
        // Number of items that can be added to this stack
        u16 freeSpace(IItemDefManager *itemdef) const
        {
                u16 max = getStackMax(itemdef);
-               if(count > max)
+               if (count >= max)
                        return 0;
                return max - count;
        }
@@ -143,13 +142,12 @@ struct ItemStack
        // If cannot be added at all, returns the item back.
        // If can be added partly, decremented item is returned back.
        // If can be added fully, empty item is returned.
-       ItemStack addItem(const ItemStack &newitem,
-                       IItemDefManager *itemdef);
+       ItemStack addItem(ItemStack newitem, IItemDefManager *itemdef);
 
        // Checks whether newitem could be added.
        // If restitem is non-NULL, it receives the part of newitem that
        // would be left over after adding.
-       bool itemFits(const ItemStack &newitem,
+       bool itemFits(ItemStack newitem,
                        ItemStack *restitem,  // may be NULL
                        IItemDefManager *itemdef) const;
 
@@ -164,17 +162,17 @@ struct ItemStack
        /*
                Properties
        */
-       std::string name;
-       u16 count;
-       u16 wear;
-       std::string metadata;
+       std::string name = "";
+       u16 count = 0;
+       u16 wear = 0;
+       ItemStackMetadata metadata;
 };
 
 class InventoryList
 {
 public:
-       InventoryList(std::string name, u32 size, IItemDefManager *itemdef);
-       ~InventoryList();
+       InventoryList(const std::string &name, u32 size, IItemDefManager *itemdef);
+       ~InventoryList() = default;
        void clearItems();
        void setSize(u32 newsize);
        void setWidth(u32 newWidth);
@@ -223,9 +221,10 @@ class InventoryList
        // Checks whether there is room for a given item
        bool roomForItem(const ItemStack &item) const;
 
-       // Checks whether the given count of the given item name
+       // Checks whether the given count of the given item
        // exists in this inventory list.
-       bool containsItem(const ItemStack &item) const;
+       // If match_meta is false, only the items' names are compared.
+       bool containsItem(const ItemStack &item, bool match_meta) const;
 
        // Removes the given count of the given item name from
        // this inventory list. Walks the list in reverse order.
@@ -239,14 +238,11 @@ class InventoryList
        // Returns empty item if couldn't take any.
        ItemStack takeItem(u32 i, u32 takecount);
 
-       // Similar to takeItem, but keeps the slot intact.
-       ItemStack peekItem(u32 i, u32 peekcount) const;
-
        // Move an item to a different list (or a different stack in the same list)
        // count is the maximum number of items to move (0 for everything)
        // returns number of moved items
        u32 moveItem(u32 i, InventoryList *dest, u32 dest_i,
-               u32 count = 0, bool swap_if_needed = true);
+               u32 count = 0, bool swap_if_needed = true, bool *did_swap = NULL);
 
        // like moveItem, but without a fixed destination index
        // also with optional rollback recording
@@ -254,8 +250,9 @@ class InventoryList
 
 private:
        std::vector<ItemStack> m_items;
-       u32 m_size, m_width;
        std::string m_name;
+       u32 m_size;
+       u32 m_width = 0;
        IItemDefManager *m_itemdef;
 };
 
@@ -310,8 +307,5 @@ class Inventory
 
        std::vector<InventoryList*> m_lists;
        IItemDefManager *m_itemdef;
-       bool m_dirty;
+       bool m_dirty = false;
 };
-
-#endif
-