minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add operator!= to Inventory(List), make operator== a const method

This commit is contained in:
Kahrl 2014-01-11 19:46:37 +01:00
parent 84b94eb198
commit 51e6feb17c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/inventory.cpp
View File

@ -562,7 +562,7 @@ InventoryList & InventoryList::operator = (const InventoryList &other)
return *this;
}
bool InventoryList::operator == (const InventoryList &other)
bool InventoryList::operator == (const InventoryList &other) const
{
if(m_size != other.m_size)
return false;
@ -875,7 +875,7 @@ Inventory & Inventory::operator = (const Inventory &other)
return *this;
}
bool Inventory::operator == (const Inventory &other)
bool Inventory::operator == (const Inventory &other) const
{
if(m_lists.size() != other.m_lists.size())
return false;

14
src/inventory.h
View File

@ -182,7 +182,11 @@ public:
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;
@ -258,8 +262,12 @@ public:
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);