Inventory: Fix wrong stack size behaviour and item loss (#6039)

SmallJoker · web-flow · commit c08cc0533fbf · 2017-06-25T11:39:39.000+02:00
Also fix itemFits and remove constness-nonsense
diff --git a/src/database-postgresql.cpp b/src/database-postgresql.cpp
@@ -584,7 +584,7 @@ bool PlayerDatabasePostgreSQL::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 			if (itemStr.length() > 0) {
 				ItemStack stack;
 				stack.deSerialize(itemStr);
-				invList->addItem(pg_to_uint(results2, row2, 0), stack);
+				invList->changeItem(pg_to_uint(results2, row2, 0), stack);
 			}
 		}
 		PQclear(results2);
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
@@ -565,7 +565,7 @@ bool PlayerDatabaseSQLite3::loadPlayer(RemotePlayer *player, PlayerSAO *sao)
 			if (itemStr.length() > 0) {
 				ItemStack stack;
 				stack.deSerialize(itemStr);
-				invList->addItem(sqlite_to_uint(m_stmt_player_load_inventory_items, 0), stack);
+				invList->changeItem(sqlite_to_uint(m_stmt_player_load_inventory_items, 0), stack);
 			}
 		}
 		sqlite3_reset(m_stmt_player_load_inventory_items);
diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -254,11 +254,8 @@ std::string ItemStack::getItemString() const
 }
 
 
-ItemStack ItemStack::addItem(const ItemStack &newitem_,
-		IItemDefManager *itemdef)
+ItemStack ItemStack::addItem(ItemStack newitem, IItemDefManager *itemdef)
 {
-	ItemStack newitem = newitem_;
-
 	// If the item is empty or the position invalid, bail out
 	if(newitem.empty())
 	{
@@ -267,7 +264,7 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,
 	// If this is an empty item, it's an easy job.
 	else if(empty())
 	{
-		const u16 stackMax = getStackMax(itemdef);
+		const u16 stackMax = newitem.getStackMax(itemdef);
 
 		*this = newitem;
 
@@ -303,11 +300,10 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,
 	return newitem;
 }
 
-bool ItemStack::itemFits(const ItemStack &newitem_,
+bool ItemStack::itemFits(ItemStack newitem,
 		ItemStack *restitem,
 		IItemDefManager *itemdef) const
 {
-	ItemStack newitem = newitem_;
 
 	// If the item is empty or the position invalid, bail out
 	if(newitem.empty())
@@ -317,7 +313,7 @@ bool ItemStack::itemFits(const ItemStack &newitem_,
 	// If this is an empty item, it's an easy job.
 	else if(empty())
 	{
-		const u16 stackMax = getStackMax(itemdef);
+		const u16 stackMax = newitem.getStackMax(itemdef);
 
 		// If the item fits fully, delete it
 		if (newitem.count <= stackMax) {
diff --git a/src/inventory.h b/src/inventory.h
@@ -143,13 +143,12 @@ struct ItemStack
 	// If cannot be added at all, returns the item back.
 	// If can be added partly, decremented item is returned back.
 	// If can be added fully, empty item is returned.
-	ItemStack addItem(const ItemStack &newitem,
-			IItemDefManager *itemdef);
+	ItemStack addItem(ItemStack newitem, IItemDefManager *itemdef);
 
 	// Checks whether newitem could be added.
 	// If restitem is non-NULL, it receives the part of newitem that
 	// would be left over after adding.
-	bool itemFits(const ItemStack &newitem,
+	bool itemFits(ItemStack newitem,
 			ItemStack *restitem,  // may be NULL
 			IItemDefManager *itemdef) const;
 

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ bool PlayerDatabasePostgreSQL::loadPlayer(RemotePlayer player, PlayerSAO sao)`
`584`	`584`	`if (itemStr.length() > 0) {`
`585`	`585`	`ItemStack stack;`
`586`	`586`	`stack.deSerialize(itemStr);`
`587`		`- invList->addItem(pg_to_uint(results2, row2, 0), stack);`
	`587`	`+ invList->changeItem(pg_to_uint(results2, row2, 0), stack);`
`588`	`588`	`}`
`589`	`589`	`}`
`590`	`590`	`PQclear(results2);`
Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ bool PlayerDatabaseSQLite3::loadPlayer(RemotePlayer player, PlayerSAO sao)`
`565`	`565`	`if (itemStr.length() > 0) {`
`566`	`566`	`ItemStack stack;`
`567`	`567`	`stack.deSerialize(itemStr);`
`568`		`- invList->addItem(sqlite_to_uint(m_stmt_player_load_inventory_items, 0), stack);`
	`568`	`+ invList->changeItem(sqlite_to_uint(m_stmt_player_load_inventory_items, 0), stack);`
`569`	`569`	`}`
`570`	`570`	`}`
`571`	`571`	`sqlite3_reset(m_stmt_player_load_inventory_items);`
Original file line number	Diff line number	Diff line change
`@@ -254,11 +254,8 @@ std::string ItemStack::getItemString() const`
`254`	`254`	`}`
`255`	`255`
`256`	`256`
`257`		`-ItemStack ItemStack::addItem(const ItemStack &newitem_,`
`258`		`- IItemDefManager *itemdef)`
	`257`	`+ItemStack ItemStack::addItem(ItemStack newitem, IItemDefManager *itemdef)`
`259`	`258`	`{`
`260`		`- ItemStack newitem = newitem_;`
`261`		`-`
`262`	`259`	`// If the item is empty or the position invalid, bail out`
`263`	`260`	`if(newitem.empty())`
`264`	`261`	`{`
`@@ -267,7 +264,7 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,`
`267`	`264`	`// If this is an empty item, it's an easy job.`
`268`	`265`	`else if(empty())`
`269`	`266`	`{`
`270`		`- const u16 stackMax = getStackMax(itemdef);`
	`267`	`+ const u16 stackMax = newitem.getStackMax(itemdef);`
`271`	`268`
`272`	`269`	`*this = newitem;`
`273`	`270`
`@@ -303,11 +300,10 @@ ItemStack ItemStack::addItem(const ItemStack &newitem_,`
`303`	`300`	`return newitem;`
`304`	`301`	`}`
`305`	`302`
`306`		`-bool ItemStack::itemFits(const ItemStack &newitem_,`
	`303`	`+bool ItemStack::itemFits(ItemStack newitem,`
`307`	`304`	`ItemStack *restitem,`
`308`	`305`	`IItemDefManager *itemdef) const`
`309`	`306`	`{`
`310`		`- ItemStack newitem = newitem_;`
`311`	`307`
`312`	`308`	`// If the item is empty or the position invalid, bail out`
`313`	`309`	`if(newitem.empty())`
`@@ -317,7 +313,7 @@ bool ItemStack::itemFits(const ItemStack &newitem_,`
`317`	`313`	`// If this is an empty item, it's an easy job.`
`318`	`314`	`else if(empty())`
`319`	`315`	`{`
`320`		`- const u16 stackMax = getStackMax(itemdef);`
	`316`	`+ const u16 stackMax = newitem.getStackMax(itemdef);`
`321`	`317`
`322`	`318`	`// If the item fits fully, delete it`
`323`	`319`	`if (newitem.count <= stackMax) {`