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

LuaItemStack: Fix and document behavior of set_name, set_count, set_wear, set_metadata

Browse source
This commit is contained in:
kwolekr 2014-12-28 23:58:06 -05:00
parent acb3519502
commit 3c637b4baf
2 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/script/lua_api/l_item.cpp
View file

@ -63,11 +63,15 @@ int LuaItemStack::l_set_name(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
bool status = true;
item.name = luaL_checkstring(L, 2);
if (item.name == "" || item.empty())
if (item.name == "" || item.empty()) {
item.clear();
status = false;
}
lua_pushboolean(L, status);
return 1;
}
@ -87,11 +91,18 @@ int LuaItemStack::l_set_count(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
item.count = luaL_checkinteger(L, 2);
if (item.name == "" || item.empty())
bool status;
lua_Integer count = luaL_checkinteger(L, 2);
if (count <= 65535) {
item.count = count;
status = true;
} else {
item.clear();
status = false;
}
lua_pushboolean(L, status);
return 1;
}
@ -111,11 +122,18 @@ int LuaItemStack::l_set_wear(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
item.wear = luaL_checkinteger(L, 2);
if (item.wear > 65535)
bool status;
lua_Integer wear = luaL_checkinteger(L, 2);
if (wear <= 65535) {
item.wear = wear;
status = true;
} else {
item.clear();
status = false;
}
lua_pushboolean(L, status);
return 1;
}
@ -138,11 +156,9 @@ int LuaItemStack::l_set_metadata(lua_State *L)
size_t len = 0;
const char *ptr = luaL_checklstring(L, 2, &len);
if (ptr)
item.metadata.assign(ptr, len);
else
item.metadata = "";
item.metadata.assign(ptr, len);
lua_pushboolean(L, true);
return 1;
}
@ -533,7 +549,7 @@ int ModApiItemMod::l_get_content_id(lua_State *L)
INodeDefManager *ndef = getServer(L)->getNodeDefManager();
content_t c = ndef->getId(name);
lua_pushinteger(L, c);
return 1; /* number of results */
}
@ -546,7 +562,7 @@ int ModApiItemMod::l_get_name_from_content_id(lua_State *L)
INodeDefManager *ndef = getServer(L)->getNodeDefManager();
const char *name = ndef->get(c).name.c_str();
lua_pushstring(L, name);
return 1; /* number of results */
}