oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-05 18:41:05 +00:00
Code Wiki Activity

Code style fixes.

Browse source
This commit is contained in:
SFENCE 2024-09-04 19:15:39 +02:00 • committed by sfence
parent 24e9db07ec
commit af3f696423
43 changed files with 493 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -445,13 +445,13 @@ int LuaItemStack::l_equals(lua_State *L)
NO_MAP_LOCK_REQUIRED;
LuaItemStack *o1 = checkObject<LuaItemStack>(L, 1);
// checks for non-userdata argument
// checks for non-userdata argument
if (!lua_isuserdata(L, 2)) {
lua_pushboolean(L, false);
return 1;
}
// check that the argument is an ItemStack
// check that the argument is an ItemStack
if (!lua_getmetatable(L, 2)) {
lua_pushboolean(L, false);
return 1;

36
src/script/lua_api/l_settings.cpp
View file

@ -182,16 +182,16 @@ int LuaSettings::l_get_flags(lua_State *L)
// get_pos(self, key) -> vector or nil
int LuaSettings::l_get_pos(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
std::optional<v3f> pos;
if (o->m_settings->getV3FNoEx(key, pos) && pos.has_value())
push_v3f(L, *pos);
else
lua_pushnil(L);
return 1;
std::optional<v3f> pos;
if (o->m_settings->getV3FNoEx(key, pos) && pos.has_value())
push_v3f(L, *pos);
else
lua_pushnil(L);
return 1;
}
// set(self, key, value)
@ -247,17 +247,17 @@ int LuaSettings::l_set_np_group(lua_State *L)
// set_pos(self, key, value)
int LuaSettings::l_set_pos(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
v3f value = check_v3f(L, 3);
std::string key = luaL_checkstring(L, 2);
v3f value = check_v3f(L, 3);
CHECK_SETTING_SECURITY(L, key);
CHECK_SETTING_SECURITY(L, key);
o->m_settings->setV3F(key, value);
o->m_settings->setV3F(key, value);
return 0;
return 0;
}
// remove(self, key) -> success
@ -389,11 +389,11 @@ const luaL_Reg LuaSettings::methods[] = {
luamethod(LuaSettings, get_bool),
luamethod(LuaSettings, get_np_group),
luamethod(LuaSettings, get_flags),
luamethod(LuaSettings, get_pos),
luamethod(LuaSettings, get_pos),
luamethod(LuaSettings, set),
luamethod(LuaSettings, set_bool),
luamethod(LuaSettings, set_np_group),
luamethod(LuaSettings, set_pos),
luamethod(LuaSettings, set_pos),
luamethod(LuaSettings, remove),
luamethod(LuaSettings, get_names),
luamethod(LuaSettings, has),

8
src/script/lua_api/l_settings.h
View file

@ -29,8 +29,8 @@ private:
// get_flags(self, key) -> key/value table
static int l_get_flags(lua_State *L);
// get_pos(self, key) -> vector or nil
static int l_get_pos(lua_State *L);
// get_pos(self, key) -> vector or nil
static int l_get_pos(lua_State *L);
// set(self, key, value)
static int l_set(lua_State *L);
@ -41,8 +41,8 @@ private:
// set_np_group(self, key, value)
static int l_set_np_group(lua_State *L);
// set_pos(self, key, value)
static int l_set_pos(lua_State *L);
// set_pos(self, key, value)
static int l_set_pos(lua_State *L);
// remove(self, key) -> success
static int l_remove(lua_State *L);