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 <ostream>
#include <string>
#include <vector>
+#include <cassert>
struct ToolCapabilities;
struct ItemStack
{
- ItemStack() {}
+ ItemStack() = default;
+
ItemStack(const std::string &name_, u16 count_,
u16 wear, IItemDefManager *itemdef);
- ~ItemStack() {}
+ ~ItemStack() = default;
// Serialization
void serialize(std::ostream &os) const;
wear += amount;
return true;
}
- else
- {
- return false;
- }
+
+ return false;
}
// If possible, adds newitem to this item.
// 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;
{
public:
InventoryList(const std::string &name, u32 size, IItemDefManager *itemdef);
- ~InventoryList();
+ ~InventoryList() = default;
void clearItems();
void setSize(u32 newsize);
void setWidth(u32 newWidth);
// 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.
IItemDefManager *m_itemdef;
bool m_dirty = false;
};
-
-#endif