projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added configurable selectionbox width. Min width = 1, Max = 5
[oweals/minetest.git]
/
src
/
inventory.h
diff --git
a/src/inventory.h
b/src/inventory.h
index 1a66a13a4b9ceb4109890461a83e9748f65af3bb..52b776db34684bd4a9dff6e7178e0eec959b446d 100644
(file)
--- a/
src/inventory.h
+++ b/
src/inventory.h
@@
-21,10
+21,9
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#define INVENTORY_HEADER
#include <iostream>
#define INVENTORY_HEADER
#include <iostream>
-#include <sstream>
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include "irrlichttypes
_bloated
.h"
+#include "irrlichttypes.h"
#include "debug.h"
#include "itemdef.h"
#include "debug.h"
#include "itemdef.h"
@@
-183,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;
@@
-259,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);