luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 00:55:20 +02:00
Code Activity

add an 'equals' method to ItemStack and compatibility w/ lua '==' (#12771)

Browse Source 
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Co-authored-by: sfan5 <sfan5@live.de>
This commit is contained in:
fluxionary
2022-10-09 05:06:09 -07:00
committed by GitHub
parent b2a3f53b29
commit 440d966b93
5 changed files with 130 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/script/lua_api/l_item.cpp
View File

@@ -433,6 +433,38 @@ int LuaItemStack::l_peek_item(lua_State *L)
return 1;
}
// equals(self, other) -> bool
int LuaItemStack::l_equals(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o1 = checkObject<LuaItemStack>(L, 1);
// checks for non-userdata argument
if (!lua_isuserdata(L, 2)) {
lua_pushboolean(L, false);
return 1;
}
// check that the argument is an ItemStack
if (!lua_getmetatable(L, 2)) {
lua_pushboolean(L, false);
return 1;
}
lua_getfield(L, LUA_REGISTRYINDEX, className);
if (!lua_rawequal(L, -1, -2)) {
lua_pushboolean(L, false);
return 1;
}
LuaItemStack *o2 = checkObject<LuaItemStack>(L, 2);
ItemStack &item1 = o1->m_stack;
ItemStack &item2 = o2->m_stack;
lua_pushboolean(L, item1 == item2);
return 1;
}
LuaItemStack::LuaItemStack(const ItemStack &item):
m_stack(item)
{
@@ -483,6 +515,7 @@ void LuaItemStack::Register(lua_State *L)
static const luaL_Reg metamethods[] = {
{"__tostring", mt_tostring},
{"__gc", gc_object},
{"__eq", l_equals},
{0, 0}
};
registerClass(L, className, methods, metamethods);
@@ -522,6 +555,7 @@ const luaL_Reg LuaItemStack::methods[] = {
luamethod(LuaItemStack, item_fits),
luamethod(LuaItemStack, take_item),
luamethod(LuaItemStack, peek_item),
luamethod(LuaItemStack, equals),
{0,0}
};

3
src/script/lua_api/l_item.h
View File

@@ -140,6 +140,9 @@ private:
// peek_item(self, peekcount=1) -> itemstack
static int l_peek_item(lua_State *L);
// equals(self, other) -> bool
static int l_equals(lua_State *L);
public:
DISABLE_CLASS_COPY(LuaItemStack)