diff options
author | sfan5 <sfan5@live.de> | 2022-04-09 14:47:59 +0200 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2022-05-02 20:54:55 +0200 |
commit | 56a558baf8ef43810014347ae624cb4ef70b6aa3 (patch) | |
tree | 071640a50dba48bc5a28d07d782b56923aa690c3 /src/script/common/c_content.cpp | |
parent | e6385e2ab74af7b01163ea91d4e3cfd5dfe6552e (diff) | |
download | minetest-56a558baf8ef43810014347ae624cb4ef70b6aa3.tar.gz minetest-56a558baf8ef43810014347ae624cb4ef70b6aa3.tar.bz2 minetest-56a558baf8ef43810014347ae624cb4ef70b6aa3.zip |
Refactor some Lua API functions in preparation for async env
Diffstat (limited to 'src/script/common/c_content.cpp')
-rw-r--r-- | src/script/common/c_content.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 36f4316ee..a233afb05 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -1371,7 +1371,7 @@ void push_inventory_lists(lua_State *L, const Inventory &inv) /******************************************************************************/ void read_inventory_list(lua_State *L, int tableindex, - Inventory *inv, const char *name, Server* srv, int forcesize) + Inventory *inv, const char *name, IGameDef *gdef, int forcesize) { if(tableindex < 0) tableindex = lua_gettop(L) + 1 + tableindex; @@ -1383,7 +1383,7 @@ 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); + std::vector<ItemStack> items = read_items(L, tableindex, gdef); size_t listsize = (forcesize >= 0) ? forcesize : items.size(); // Create or resize/clear list @@ -1635,7 +1635,7 @@ void push_items(lua_State *L, const std::vector<ItemStack> &items) } /******************************************************************************/ -std::vector<ItemStack> read_items(lua_State *L, int index, Server *srv) +std::vector<ItemStack> read_items(lua_State *L, int index, IGameDef *gdef) { if(index < 0) index = lua_gettop(L) + 1 + index; @@ -1651,7 +1651,7 @@ std::vector<ItemStack> read_items(lua_State *L, int index, Server *srv) if (items.size() < (u32) key) { items.resize(key); } - items[key - 1] = read_item(L, -1, srv->idef()); + items[key - 1] = read_item(L, -1, gdef->idef()); lua_pop(L, 1); } return items; |