Skip to content
Permalink
Browse files
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.
  • Loading branch information
SmallJoker committed Jun 30, 2021
1 parent 72927b7 commit f2fd4432625ee5cf0380bdd006cd1f15d053b12f
Showing with 9 additions and 12 deletions.
  1. +6 −9 src/inventory.cpp
  2. +1 −1 src/inventory.h
  3. +2 −2 src/script/common/c_content.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;
@@ -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;
@@ -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);

0 comments on commit f2fd443

Please sign in to comment.