From 69009f07675f0484bb4f31e2decd36b70f43cacc Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Sat, 13 May 2017 11:47:05 -0700 Subject: [PATCH] [mp_moremesecons] Update to Git patch cae948e: https://github.com/AntumDeluge/mtmp-moremesecons/tree/cae948e --- README.md | 2 +- mods/mp_moremesecons/moremesecons_sayer/init.lua | 2 +- mods/mp_moremesecons/moremesecons_utils/init.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aba9c557..2903e10e 100644 --- a/README.md +++ b/README.md @@ -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_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/58e123a [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.mydoors]: https://github.com/AntumDeluge/mtmp-mydoors/tree/e36c9d1 [patch.nether]: https://github.com/AntumDeluge/mtmod-nether/tree/f634851 diff --git a/mods/mp_moremesecons/moremesecons_sayer/init.lua b/mods/mp_moremesecons/moremesecons_sayer/init.lua index 85b82ce0..f5d0bad8 100644 --- a/mods/mp_moremesecons/moremesecons_sayer/init.lua +++ b/mods/mp_moremesecons/moremesecons_sayer/init.lua @@ -35,7 +35,7 @@ if use_speech_dispatcher then nil, "" } - local language = minetest.setting_get("language") or "en" + local language = minetest.settings:get("language") or "en" if language ~= "en" then tab[3] = "-l "..language end diff --git a/mods/mp_moremesecons/moremesecons_utils/init.lua b/mods/mp_moremesecons/moremesecons_utils/init.lua index 0f83dab5..f22c88a1 100644 --- a/mods/mp_moremesecons/moremesecons_utils/init.lua +++ b/mods/mp_moremesecons/moremesecons_utils/init.lua @@ -4,15 +4,15 @@ function moremesecons.setting(modname, settingname, default, min) local setting = "moremesecons_" .. modname .. "." .. settingname if type(default) == "boolean" then - local ret = minetest.setting_getbool(setting) + local ret = minetest.settings:get_bool(setting) if ret == nil then ret = default end return ret elseif type(default) == "string" then - return minetest.setting_get(setting) or default + return minetest.settings:get(setting) or default 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 minetest.log("warning", "[moremesecons_"..modname.."]: setting '"..setting.."' is NaN. Set to default value ("..tostring(default)..").") ret = default