[mp_moremesecons] Update to Git patch cae948e:

https://github.com/AntumDeluge/mtmp-moremesecons/tree/cae948e
master
AntumDeluge 2017-05-13 11:47:05 -07:00
parent 2333ff0714
commit 69009f0767
3 changed files with 5 additions and 5 deletions

View File

@ -505,7 +505,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.mobs_goblins]: https://github.com/AntumDeluge/mtmod-mobs_goblins/tree/8813304 [patch.mobs_goblins]: https://github.com/AntumDeluge/mtmod-mobs_goblins/tree/8813304
[patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/58e123a [patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/58e123a
[patch.moreblocks]: https://github.com/AntumDeluge/mtmod-moreblocks/tree/786f9e4 [patch.moreblocks]: https://github.com/AntumDeluge/mtmod-moreblocks/tree/786f9e4
[patch.moremesecons]: https://github.com/AntumDeluge/mtmp-moremesecons/tree/caa71bc [patch.moremesecons]: https://github.com/AntumDeluge/mtmp-moremesecons/tree/cae948e
[patch.moreores]: https://github.com/AntumDeluge/mtmod-moreores/tree/8b874f6 [patch.moreores]: https://github.com/AntumDeluge/mtmod-moreores/tree/8b874f6
[patch.mydoors]: https://github.com/AntumDeluge/mtmp-mydoors/tree/e36c9d1 [patch.mydoors]: https://github.com/AntumDeluge/mtmp-mydoors/tree/e36c9d1
[patch.nether]: https://github.com/AntumDeluge/mtmod-nether/tree/f634851 [patch.nether]: https://github.com/AntumDeluge/mtmod-nether/tree/f634851

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

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 ret ~= ret then -- NaN if ret ~= ret then -- NaN
minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' is NaN. Set to default value ("..tostring(default)..").") minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' is NaN. Set to default value ("..tostring(default)..").")
ret = default ret = default