1 files changed, 33 insertions, 12 deletions

diff --git a/src/Item.h b/src/Item.h
index c60d0542c..727965112 100644
--- a/src/Item.h
+++ b/src/Item.h
@@ -36,7 +36,9 @@ public:
 	cItem(void) :
 		m_ItemType(E_ITEM_EMPTY),
 		m_ItemCount(0),
-		m_ItemDamage(0)
+		m_ItemDamage(0),
+		m_CustomName(""),
+		m_Lore("")
 	{
 	}
 	
@@ -46,12 +48,16 @@ public:
 		short a_ItemType,
 		char a_ItemCount = 1,
 		short a_ItemDamage = 0,
-		const AString & a_Enchantments = ""
+		const AString & a_Enchantments = "",
+		const AString & a_CustomName = "",
+		const AString & a_Lore = ""
 	) :
 		m_ItemType    (a_ItemType),
 		m_ItemCount   (a_ItemCount),
 		m_ItemDamage  (a_ItemDamage),
-		m_Enchantments(a_Enchantments)
+		m_Enchantments(a_Enchantments),
+		m_CustomName  (a_CustomName),
+		m_Lore        (a_Lore)
 	{
 		if (!IsValidItem(m_ItemType))
 		{
@@ -69,7 +75,9 @@ public:
 		m_ItemType    (a_CopyFrom.m_ItemType),
 		m_ItemCount   (a_CopyFrom.m_ItemCount),
 		m_ItemDamage  (a_CopyFrom.m_ItemDamage),
-		m_Enchantments(a_CopyFrom.m_Enchantments)
+		m_Enchantments(a_CopyFrom.m_Enchantments),
+		m_CustomName  (a_CopyFrom.m_CustomName),
+		m_Lore        (a_CopyFrom.m_Lore)
 	{
 	}
 	
@@ -80,6 +88,8 @@ public:
 		m_ItemCount = 0;
 		m_ItemDamage = 0;
 		m_Enchantments.Clear();
+		m_CustomName = "";
+		m_Lore = "";
 	}
 	
 	
@@ -96,13 +106,16 @@ public:
 		return ((m_ItemType <= 0) || (m_ItemCount <= 0));
 	}
 	
-	
+	/* Returns true if this itemstack can stack with the specified stack (types match, enchantments etc.) ItemCounts are ignored!
+	*/
 	bool IsEqual(const cItem & a_Item) const
 	{
 		return (
 			IsSameType(a_Item) &&
 			(m_ItemDamage == a_Item.m_ItemDamage) &&
-			(m_Enchantments == a_Item.m_Enchantments)
+			(m_Enchantments == a_Item.m_Enchantments) &&
+			(m_CustomName == a_Item.m_CustomName) &&
+			(m_Lore == a_Item.m_Lore)
 		);
 	}
 	
@@ -111,7 +124,16 @@ public:
 	{
 		return (m_ItemType == a_Item.m_ItemType) || (IsEmpty() && a_Item.IsEmpty());
 	}
-	
+
+
+	bool IsBothNameAndLoreEmpty(void) const
+	{
+		return (m_CustomName.empty() && m_Lore.empty());
+	}
+
+
+	bool IsCustomNameEmpty(void) const { return (m_CustomName.empty()); }
+	bool IsLoreEmpty(void) const { return (m_Lore.empty()); }	
 
 	/// Returns a copy of this item with m_ItemCount set to 1. Useful to preserve enchantments etc. on stacked items
 	cItem CopyOne(void) const;
@@ -127,9 +149,6 @@ public:
 
 	inline bool IsDamageable(void) const { return (GetMaxDamage() > 0); }
 	
-	/// Returns true if this itemstack can stack with the specified stack (types match, enchantments etc.) ItemCounts are ignored!
-	bool IsStackableWith(const cItem & a_OtherStack) const;
-	
 	/// Returns true if the item is stacked up to its maximum stacking.
 	bool IsFullStack(void) const;
 	
@@ -155,6 +174,8 @@ public:
 	short         m_ItemType;
 	char          m_ItemCount;
 	short         m_ItemDamage;
+	AString       m_CustomName;
+	AString       m_Lore;
 	cEnchantments m_Enchantments;
 };
 // tolua_end
@@ -181,9 +202,9 @@ public:
 	void    Delete(int a_Idx);
 	void    Clear (void) {clear(); }
 	int     Size  (void) {return size(); }
-	void    Set   (int a_Idx, ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemDamage);
+	void    Set   (int a_Idx, short a_ItemType, char a_ItemCount, short a_ItemDamage);
 
-	void    Add   (ENUM_ITEM_ID a_ItemType, char a_ItemCount, short a_ItemDamage)
+	void    Add   (short a_ItemType, char a_ItemCount, short a_ItemDamage)
 	{
 		push_back(cItem(a_ItemType, a_ItemCount, a_ItemDamage));
 	}