Skip to content
Permalink
Browse files

Define operators == and != for ItemStack

  • Loading branch information...
ClobberXD authored and sfan5 committed May 11, 2019
1 parent 72feab0 commit 8e3b63bd28579d8f8cb3e7844600504f12b087a5
Showing with 16 additions and 8 deletions.
  1. +2 −7 src/inventory.cpp
  2. +14 −1 src/inventory.h
@@ -508,14 +508,9 @@ bool InventoryList::operator == (const InventoryList &other) const
return false;
if(m_name != other.m_name)
return false;
for(u32 i=0; i<m_items.size(); i++)
{
ItemStack s1 = m_items[i];
ItemStack s2 = other.m_items[i];
if(s1.name != s2.name || s1.wear!= s2.wear || s1.count != s2.count ||
s1.metadata != s2.metadata)
for (u32 i = 0; i < m_items.size(); i++)
if (m_items[i] != other.m_items[i])
return false;
}

return true;
}
@@ -41,7 +41,7 @@ struct ItemStack

// Serialization
void serialize(std::ostream &os) const;
// Deserialization. Pass itemdef unless you don't want aliases resolved.
// Deserialization. Pass itemdef unless you don't want aliases resolved.
void deSerialize(std::istream &is, IItemDefManager *itemdef = NULL);
void deSerialize(const std::string &s, IItemDefManager *itemdef = NULL);

@@ -161,6 +161,19 @@ struct ItemStack
// Similar to takeItem, but keeps this ItemStack intact.
ItemStack peekItem(u32 peekcount) const;

bool operator ==(const ItemStack &s) const
{
return (this->name == s.name &&
this->count == s.count &&
this->wear == s.wear &&
this->metadata == s.metadata);
}

bool operator !=(const ItemStack &s) const
{
return !(*this == s);
}

/*
Properties
*/

0 comments on commit 8e3b63b

Please sign in to comment.
You can’t perform that action at this time.