From 7a1505b32da6c45838bb0ba6654ab7ef305560d6 Mon Sep 17 00:00:00 2001
From: paramat <mat.gregory@virginmedia.com>
Date: Wed, 6 Jul 2016 17:14:39 +0100
Subject: [PATCH] merge upstream commit: Default, flowers: Use
'get_mapgen_setting()'
---
mods/default/mapgen.lua | 6 +++---
mods/flowers/mapgen.lua | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 89ded047..7d0b0fd4 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -1523,12 +1523,12 @@ end
-- Mods using singlenode mapgen can call these functions to enable
-- the use of minetest.generate_ores or minetest.generate_decorations
-local mg_params = minetest.get_mapgen_params()
-if mg_params.mgname == "v6" then
+local mg_name = minetest.get_mapgen_setting("mg_name")
+if mg_name == "v6" then
default.register_ores()
default.register_mgv6_decorations()
minetest.register_on_generated(default.generate_nyancats)
-elseif mg_params.mgname ~= "singlenode" then
+elseif mg_name ~= "singlenode" then
default.register_biomes()
default.register_ores()
default.register_decorations()
diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua
index 59ce97a3..162b11db 100644
--- a/mods/flowers/mapgen.lua
+++ b/mods/flowers/mapgen.lua
@@ -165,9 +165,9 @@ end
-- Mods using singlenode mapgen can call these functions to enable
-- the use of minetest.generate_ores or minetest.generate_decorations
-local mg_params = minetest.get_mapgen_params()
-if mg_params.mgname == "v6" then
+local mg_name = minetest.get_mapgen_setting("mg_name")
+if mg_name == "v6" then
flowers.register_mgv6_decorations()
-elseif mg_params.mgname ~= "singlenode" then
+elseif mg_name ~= "singlenode" then
flowers.register_decorations()
end
--
GitLab