Luanti/fun_caves
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change some variable names.

Browse source
This commit is contained in:
Duane 2016-08-01 01:24:43 -05:00
parent 92bb8a6c8e
commit 138858c2a2
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mapgen.lua
View file

@ -425,8 +425,8 @@ local function generate(p_minp, p_maxp, seed)
fun_caves.fortress(minp, maxp, data, area, node) fun_caves.fortress(minp, maxp, data, area, node)
write = true write = true
elseif fun_caves.cavegen and fun_caves.decogen and fun_caves.treegen then elseif fun_caves.cavegen and fun_caves.decogen and fun_caves.treegen then
local write1, write2, write3, write4, write5, h2 local write_cave, write_deco, write_tree, write_pyr, write_vill, h2
write1, h2 = fun_caves.cavegen(minp, maxp, data, area, node, heightmap, underzone) write_cave, h2 = fun_caves.cavegen(minp, maxp, data, area, node, heightmap, underzone)
if h2 then if h2 then
heightmap = h2 heightmap = h2
end end
@ -436,16 +436,16 @@ local function generate(p_minp, p_maxp, seed)
biomemap = minetest.get_mapgen_object("biomemap") biomemap = minetest.get_mapgen_object("biomemap")
end end
write2, write_p2 = fun_caves.decogen(minp, maxp, data, p2data, area, node, heightmap, biomemap, biome_ids, underzone) write_deco, write_p2 = fun_caves.decogen(minp, maxp, data, p2data, area, node, heightmap, biomemap, biome_ids, underzone)
write3 = fun_caves.treegen(minp, maxp, data, p2data, area, node) write_tree = fun_caves.treegen(minp, maxp, data, p2data, area, node)
if not write3 and fun_caves.pyramid then if not write_tree and fun_caves.pyramid then
write4, write_p4 = fun_caves.pyramid(minp, maxp, data, p2data, area, biomemap, biome_ids, node, heightmap) write_pyr, write_p4 = fun_caves.pyramid(minp, maxp, data, p2data, area, biomemap, biome_ids, node, heightmap)
end end
if fun_caves.use_villages and biomemap and not (write3 or write4) and fun_caves.village then if fun_caves.use_villages and biomemap and not (write_tree or write_pyr) and fun_caves.village then
local biome = biome_ids[biomemap[40*80+40]] local biome = biome_ids[biomemap[40*80+40]]
write5 = fun_caves.village(minp, maxp, data, p2data, area, node, biome, heightmap) write_vill = fun_caves.village(minp, maxp, data, p2data, area, node, biome, heightmap)
end end
write = write1 or write2 or write3 or write4 or write5 write = write_cave or write_deco or write_tree or write_pyr or write_vill
end end
@ -489,6 +489,7 @@ local function pgenerate(...)
if not status then if not status then
print('Fun Caves: Could not generate terrain:') print('Fun Caves: Could not generate terrain:')
print(dump(err)) print(dump(err))
collectgarbage("collect")
end end
end end