mirror of
https://github.com/minetest/minetest_game.git
synced 2024-12-23 07:10:19 +01:00
Fix leaking globals in flowers and default mapgen.lua
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
This commit is contained in:
parent
e71b71c1a9
commit
3bf3249d71
@ -278,7 +278,7 @@ function default.mgv6_ongen(minp, maxp, seed)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function default.make_cactus(pos, size)
|
function default.make_cactus(pos, size)
|
||||||
for y=0,size-1 do
|
for y=0,size-1 do
|
||||||
local p = {x=pos.x, y=pos.y+y, z=pos.z}
|
local p = {x=pos.x, y=pos.y+y, z=pos.z}
|
||||||
@ -377,7 +377,7 @@ function default.mgv6_ongen(minp, maxp, seed)
|
|||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if ground_y then
|
if ground_y then
|
||||||
local p = {x=x,y=ground_y+1,z=z}
|
local p = {x=x,y=ground_y+1,z=z}
|
||||||
local nn = minetest.get_node(p).name
|
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 desert sand, add dry shrub
|
||||||
if nn == "default:desert_sand" then
|
if nn == "default:desert_sand" then
|
||||||
minetest.set_node(p,{name="default:dry_shrub"})
|
minetest.set_node(p,{name="default:dry_shrub"})
|
||||||
|
|
||||||
-- If dirt with grass, add grass
|
-- If dirt with grass, add grass
|
||||||
elseif nn == "default:dirt_with_grass" then
|
elseif nn == "default:dirt_with_grass" then
|
||||||
minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
|
minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -406,9 +406,8 @@ end
|
|||||||
-- Detect mapgen and register suitable on-generated function
|
-- Detect mapgen and register suitable on-generated function
|
||||||
--
|
--
|
||||||
|
|
||||||
minetest.register_on_mapgen_init(function(MapgenParams)
|
minetest.register_on_mapgen_init(function(mg_params)
|
||||||
mgname = MapgenParams.mgname
|
if mg_params.mgname == "v6" then
|
||||||
if mgname == "v6" then
|
|
||||||
minetest.register_on_generated(default.mgv6_ongen)
|
minetest.register_on_generated(default.mgv6_ongen)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
@ -466,4 +465,3 @@ function default.generate_nyancats(minp, maxp, seed)
|
|||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_on_generated(default.generate_nyancats)
|
minetest.register_on_generated(default.generate_nyancats)
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ function flowers.mgv6ongen(minp, maxp, seed)
|
|||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if ground_y then
|
if ground_y then
|
||||||
local p = {x=x,y=ground_y+1,z=z}
|
local p = {x=x,y=ground_y+1,z=z}
|
||||||
local nn = minetest.get_node(p).name
|
local nn = minetest.get_node(p).name
|
||||||
@ -54,7 +54,7 @@ function flowers.mgv6ongen(minp, maxp, seed)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -63,10 +63,8 @@ end
|
|||||||
|
|
||||||
-- Enable in mapgen v6 only
|
-- Enable in mapgen v6 only
|
||||||
|
|
||||||
minetest.register_on_mapgen_init(function(MapgenParams)
|
minetest.register_on_mapgen_init(function(mg_params)
|
||||||
mgname = MapgenParams.mgname
|
if mg_params.mgname == "v6" then
|
||||||
if mgname == "v6" then
|
|
||||||
minetest.register_on_generated(flowers.mgv6ongen)
|
minetest.register_on_generated(flowers.mgv6ongen)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user