oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix the documentation of InvRef:get_lists() and clean up code (#12150)

Browse source
This commit is contained in:
DS 2022-03-29 18:06:16 +02:00 • committed by GitHub
parent 0f25fa7af6
commit 8d387433b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 56 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/script/lua_api/l_inventory.cpp
View file

@ -214,11 +214,16 @@ int InvRef::l_get_list(lua_State *L)
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
Inventory *inv = getinv(L, ref);
if(inv){
push_inventory_list(L, inv, listname);
} else {
if (!inv) {
lua_pushnil(L);
return 1;
}
InventoryList *invlist = inv->getList(listname);
if (!invlist) {
lua_pushnil(L);
return 1;
}
push_inventory_list(L, *invlist);
return 1;
}
@ -242,7 +247,7 @@ int InvRef::l_set_list(lua_State *L)
return 0;
}
// get_lists(self) -> list of InventoryLists
// get_lists(self) -> table that maps listnames to InventoryLists
int InvRef::l_get_lists(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
@ -251,15 +256,7 @@ int InvRef::l_get_lists(lua_State *L)
if (!inv) {
return 0;
}
std::vector<const InventoryList*> lists = inv->getLists();
std::vector<const InventoryList*>::iterator iter = lists.begin();
lua_createtable(L, 0, lists.size());
for (; iter != lists.end(); iter++) {
const char* name = (*iter)->getName().c_str();
lua_pushstring(L, name);
push_inventory_list(L, inv, name);
lua_rawset(L, -3);
}
push_inventory_lists(L, *inv);
return 1;
}

12
src/script/lua_api/l_nodemeta.cpp
View file

@ -127,18 +127,14 @@ void NodeMetaRef::handleToTable(lua_State *L, Metadata *_meta)
// fields
MetaDataRef::handleToTable(L, _meta);
NodeMetadata *meta = (NodeMetadata*) _meta;
NodeMetadata *meta = (NodeMetadata *) _meta;
// inventory
lua_newtable(L);
Inventory *inv = meta->getInventory();
if (inv) {
std::vector<const InventoryList *> lists = inv->getLists();
for(std::vector<const InventoryList *>::const_iterator
i = lists.begin(); i != lists.end(); ++i) {
push_inventory_list(L, inv, (*i)->getName().c_str());
lua_setfield(L, -2, (*i)->getName().c_str());
}
push_inventory_lists(L, *inv);
} else {
lua_newtable(L);
}
lua_setfield(L, -2, "inventory");
}