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

Refactor some Lua API functions in preparation for async env

Browse source
This commit is contained in:
sfan5 2022-04-09 14:47:59 +02:00
parent e6385e2ab7
commit 56a558baf8
8 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/script/common/c_content.cpp
View file

@ -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;

6
src/script/common/c_content.h
View file

@ -59,7 +59,7 @@ class InventoryList;
struct NodeBox;
struct ContentFeatures;
struct TileDef;
class Server;
class IGameDef;
struct DigParams;
struct HitParams;
struct EnumString;
@ -126,7 +126,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=-1);
IGameDef *gdef, int forcesize=-1);
MapNode readnode (lua_State *L, int index,
const NodeDefManager *ndef);
@ -166,7 +166,7 @@ void push_items (lua_State *L,
std::vector<ItemStack> read_items (lua_State *L,
int index,
Server* srv);
IGameDef* gdef);
void push_soundspec (lua_State *L,
const SimpleSoundSpec &spec);