minetest-mods
/
MoreMesecons
mirror of https://github.com/minetest-mods/MoreMesecons.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'AntumDeluge-settings'

This commit is contained in:
upsilon 2017-06-04 17:56:30 +02:00
parent 6662f92902 d580e0e974
commit aa2ae82cc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moremesecons_sayer/init.lua
View File

@ -35,7 +35,7 @@ if use_speech_dispatcher then
nil, nil,
"" ""
} }
local language = minetest.setting_get("language") or "en" local language = minetest.settings:get("language") or "en"
if language ~= "en" then if language ~= "en" then
tab[3] = "-l "..language tab[3] = "-l "..language
end end

6
moremesecons_utils/init.lua
View File

@ -4,15 +4,15 @@ function moremesecons.setting(modname, settingname, default, min)
local setting = "moremesecons_" .. modname .. "." .. settingname local setting = "moremesecons_" .. modname .. "." .. settingname
if type(default) == "boolean" then if type(default) == "boolean" then
local ret = minetest.setting_getbool(setting) local ret = minetest.settings:get_bool(setting)
if ret == nil then if ret == nil then
ret = default ret = default
end end
return ret return ret
elseif type(default) == "string" then elseif type(default) == "string" then
return minetest.setting_get(setting) or default return minetest.settings:get(setting) or default
elseif type(default) == "number" then elseif type(default) == "number" then
local ret = tonumber(minetest.setting_get(setting)) or default local ret = tonumber(minetest.settings:get(setting)) or default
if not ret then if not ret then
minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' must be a number. Set to default value ("..tostring(default)..").") minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' must be a number. Set to default value ("..tostring(default)..").")
ret = default ret = default