projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Node highlighting.
[oweals/minetest.git]
/
src
/
inventory.h
diff --git
a/src/inventory.h
b/src/inventory.h
index cd592a17ac9cfe0375eac4a13ba77ecf9176c097..52b776db34684bd4a9dff6e7178e0eec959b446d 100644
(file)
--- a/
src/inventory.h
+++ b/
src/inventory.h
@@
-182,7
+182,11
@@
public:
InventoryList(const InventoryList &other);
InventoryList & operator = (const InventoryList &other);
InventoryList(const InventoryList &other);
InventoryList & operator = (const InventoryList &other);
- bool operator == (const InventoryList &other);
+ bool operator == (const InventoryList &other) const;
+ bool operator != (const InventoryList &other) const
+ {
+ return !(*this == other);
+ }
const std::string &getName() const;
u32 getSize() const;
const std::string &getName() const;
u32 getSize() const;
@@
-258,8
+262,12
@@
public:
Inventory(IItemDefManager *itemdef);
Inventory(const Inventory &other);
Inventory & operator = (const Inventory &other);
Inventory(IItemDefManager *itemdef);
Inventory(const Inventory &other);
Inventory & operator = (const Inventory &other);
- bool operator == (const Inventory &other);
-
+ bool operator == (const Inventory &other) const;
+ bool operator != (const Inventory &other) const
+ {
+ return !(*this == other);
+ }
+
void serialize(std::ostream &os) const;
void deSerialize(std::istream &is);
void serialize(std::ostream &os) const;
void deSerialize(std::istream &is);