Inventory: Make addList() consistent (#11382)

Fixes list clearing for inv:set_list() using same size, since 2db6b07. addList() now clears the list in all cases. Use setSize() to resize without clearing.
minetest · Jun 30, 2021 · f2fd443 · f2fd443
1 parent 72927b7
commit f2fd443
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/inventory.cpp b/src/inventory.cpp
@@ -938,19 +938,16 @@ void Inventory::deSerialize(std::istream &is)
 InventoryList * Inventory::addList(const std::string &name, u32 size)
 {
 	setModified();
+
+	// Remove existing lists
 	s32 i = getListIndex(name);
-	if(i != -1)
-	{
-		if(m_lists[i]->getSize() != size)
-		{
-			delete m_lists[i];
-			m_lists[i] = new InventoryList(name, size, m_itemdef);
-			m_lists[i]->setModified();
-		}
+	if (i != -1) {
+		delete m_lists[i];
+		m_lists[i] = new InventoryList(name, size, m_itemdef);
+		m_lists[i]->setModified();
 		return m_lists[i];
 	}
 
-
 	//don't create list with invalid name
 	if (name.find(' ') != std::string::npos)
 		return nullptr;

diff --git a/src/inventory.h b/src/inventory.h
@@ -298,7 +298,7 @@ class Inventory
 	void serialize(std::ostream &os, bool incremental = false) const;
 	void deSerialize(std::istream &is);
 
-	// Adds a new list or clears and resizes an existing one
+	// Creates a new list if none exists or truncates existing lists
 	InventoryList * addList(const std::string &name, u32 size);
 	InventoryList * getList(const std::string &name);
 	const InventoryList * getList(const std::string &name) const;

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -1359,9 +1359,9 @@ void read_inventory_list(lua_State *L, int tableindex,
 
 	// Get Lua-specified items to insert into the list
 	std::vector<ItemStack> items = read_items(L, tableindex,srv);
-	size_t listsize = (forcesize > 0) ? forcesize : items.size();
+	size_t listsize = (forcesize >= 0) ? forcesize : items.size();
 
-	// Create or clear list
+	// Create or resize/clear list
 	InventoryList *invlist = inv->addList(name, listsize);
 	if (!invlist) {
 		luaL_error(L, "inventory list: cannot create list named '%s'", name);