From 3bf3249d7103efecabac72d75a1b075d6c551d42 Mon Sep 17 00:00:00 2001
From: PenguinDad <tamarok40@gmail.com>
Date: Thu, 20 Nov 2014 17:02:07 +0100
Subject: [PATCH] Fix leaking globals in flowers and default mapgen.lua
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
---
mods/default/mapgen.lua | 14 ++++++--------
mods/flowers/mapgen.lua | 10 ++++------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 624206f3..386ba417 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -278,7 +278,7 @@ function default.mgv6_ongen(minp, maxp, seed)
end
end
end
-
+
function default.make_cactus(pos, size)
for y=0,size-1 do
local p = {x=pos.x, y=pos.y+y, z=pos.z}
@@ -377,7 +377,7 @@ function default.mgv6_ongen(minp, maxp, seed)
break
end
end
-
+
if ground_y then
local p = {x=x,y=ground_y+1,z=z}
local nn = minetest.get_node(p).name
@@ -388,14 +388,14 @@ function default.mgv6_ongen(minp, maxp, seed)
-- If desert sand, add dry shrub
if nn == "default:desert_sand" then
minetest.set_node(p,{name="default:dry_shrub"})
-
+
-- If dirt with grass, add grass
elseif nn == "default:dirt_with_grass" then
minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
end
end
end
-
+
end
end
end
@@ -406,9 +406,8 @@ end
-- Detect mapgen and register suitable on-generated function
--
-minetest.register_on_mapgen_init(function(MapgenParams)
- mgname = MapgenParams.mgname
- if mgname == "v6" then
+minetest.register_on_mapgen_init(function(mg_params)
+ if mg_params.mgname == "v6" then
minetest.register_on_generated(default.mgv6_ongen)
end
end)
@@ -466,4 +465,3 @@ function default.generate_nyancats(minp, maxp, seed)
end
minetest.register_on_generated(default.generate_nyancats)
-
diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua
index 11599ed0..55e0edcc 100644
--- a/mods/flowers/mapgen.lua
+++ b/mods/flowers/mapgen.lua
@@ -26,7 +26,7 @@ function flowers.mgv6ongen(minp, maxp, seed)
break
end
end
-
+
if ground_y then
local p = {x=x,y=ground_y+1,z=z}
local nn = minetest.get_node(p).name
@@ -54,7 +54,7 @@ function flowers.mgv6ongen(minp, maxp, seed)
end
end
end
-
+
end
end
end
@@ -63,10 +63,8 @@ end
-- Enable in mapgen v6 only
-minetest.register_on_mapgen_init(function(MapgenParams)
- mgname = MapgenParams.mgname
- if mgname == "v6" then
+minetest.register_on_mapgen_init(function(mg_params)
+ if mg_params.mgname == "v6" then
minetest.register_on_generated(flowers.mgv6ongen)
end
end)
-
--
GitLab