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

Make string to v3f parsing consistent, replace core.setting_get_pos() by core.settings:get_pos() (#15438)

Browse source 
Co-authored-by: sfan5 <sfan5@live.de>
Co-authored-by: Lars Müller <34514239+appgurueu@users.noreply.github.com>
This commit is contained in:
AFCMS 2024-12-04 18:19:46 +01:00 • committed by GitHub
parent 18caf3a18d
commit e545e96d2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 162 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
#include "settings.h"
#include "noise.h"
#include "log.h"
#include "common/c_converter.h"
/*
@ -177,6 +178,21 @@ int LuaSettings::l_get_flags(lua_State *L)
return 1;
}
// 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);
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)
int LuaSettings::l_set(lua_State* L)
{
@ -227,6 +243,22 @@ int LuaSettings::l_set_np_group(lua_State *L)
return 0;
}
// set_pos(self, key, value)
int LuaSettings::l_set_pos(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
LuaSettings *o = checkObject<LuaSettings>(L, 1);
std::string key = luaL_checkstring(L, 2);
v3f value = check_v3f(L, 3);
CHECK_SETTING_SECURITY(L, key);
o->m_settings->setV3F(key, value);
return 0;
}
// remove(self, key) -> success
int LuaSettings::l_remove(lua_State* L)
{
@ -356,9 +388,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, set),
luamethod(LuaSettings, set_bool),
luamethod(LuaSettings, set_np_group),
luamethod(LuaSettings, set_pos),
luamethod(LuaSettings, remove),
luamethod(LuaSettings, get_names),
luamethod(LuaSettings, has),