Inventory: Make ItemStack with different metadata not stackable

xunto · paramat · commit ae7fb9b5bea2 · 2016-04-26T10:16:20.000+01:00
diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -335,8 +335,9 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,
 		*this = newitem;
 		newitem.clear();
 	}
-	// If item name differs, bail out
-	else if(name != newitem.name)
+	// If item name or metadata differs, bail out 
+	else if (name != newitem.name
+		|| metadata != newitem.metadata)
 	{
 		// cannot be added
 	}
@@ -374,8 +375,9 @@ bool ItemStack::itemFits(const ItemStack &newitem_,
 	{
 		newitem.clear();
 	}
-	// If item name differs, bail out
-	else if(name != newitem.name)
+	// If item name or metadata differs, bail out 
+	else if (name != newitem.name
+		|| metadata != newitem.metadata)
 	{
 		// cannot be added
 	}

Original file line number	Diff line number	Diff line change
`@@ -335,8 +335,9 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,`
`335`	`335`	`*this = newitem;`
`336`	`336`	`newitem.clear();`
`337`	`337`	`}`
`338`		`- // If item name differs, bail out`
`339`		`- else if(name != newitem.name)`
	`338`	`+ // If item name or metadata differs, bail out`
	`339`	`+ else if (name != newitem.name`
	`340`	`+ \|\| metadata != newitem.metadata)`
`340`	`341`	`{`
`341`	`342`	`// cannot be added`
`342`	`343`	`}`
`@@ -374,8 +375,9 @@ bool ItemStack::itemFits(const ItemStack &newitem_,`
`374`	`375`	`{`
`375`	`376`	`newitem.clear();`
`376`	`377`	`}`
`377`		`- // If item name differs, bail out`
`378`		`- else if(name != newitem.name)`
	`378`	`+ // If item name or metadata differs, bail out`
	`379`	`+ else if (name != newitem.name`
	`380`	`+ \|\| metadata != newitem.metadata)`
`379`	`381`	`{`
`380`	`382`	`// cannot be added`
`381`	`383`	`}`