Merge branch 'master' into settings

This commit is contained in:
Pierre-Adrien Langrognet
2017-06-04 17:57:16 +02:00
committed by GitHub
34 changed files with 822 additions and 4 deletions

View File

@ -13,7 +13,10 @@ function moremesecons.setting(modname, settingname, default, min)
return minetest.settings:get(setting) or default
elseif type(default) == "number" then
local ret = tonumber(minetest.settings:get(setting)) or default
if ret ~= ret then -- NaN
if not ret then
minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' must be a number. Set to default value ("..tostring(default)..").")
ret = default
elseif ret ~= ret then -- NaN
minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' is NaN. Set to default value ("..tostring(default)..").")
ret = default
end