Revert "Use an LVM to emerge map, place schematic, and fix lighting"

This reverts commit 7732d0c23d.
This commit is contained in:
rubenwardy 2018-07-19 22:16:58 +01:00
parent 35da0ca3fe
commit da8c9b53aa
No known key found for this signature in database
GPG key ID: A1E29D52FF81513C

View file

@ -22,8 +22,8 @@ minetest.register_alias("default:grass_5", "air")
minetest.register_alias("default:bush_leaves", "air") minetest.register_alias("default:bush_leaves", "air")
minetest.register_alias("default:bush_stem", "air") minetest.register_alias("default:bush_stem", "air")
local max_r = 120 local max_r = 120
local max_h = 150
local mapdir = minetest.get_modpath("ctf_map") .. "/maps/" local mapdir = minetest.get_modpath("ctf_map") .. "/maps/"
ctf_map.map = nil ctf_map.map = nil
@ -73,21 +73,13 @@ minetest.register_chatcommand("maps_reload", {
function ctf_map.place_map(map) function ctf_map.place_map(map)
ctf_map.emerge_with_callbacks(nil, map.pos1, map.pos2, function()
local schempath = mapdir .. map.schematic local schempath = mapdir .. map.schematic
local res = minetest.place_schematic(map.pos1, schempath,
--------------------------------------------------
-- LVM
local vm = minetest.get_voxel_manip(map.pos1, map.pos2)
local res = minetest.place_schematic_on_vmanip(vm, map.pos1, schempath,
map.rotation == "z" and "0" or "90") map.rotation == "z" and "0" or "90")
assert(res) assert(res)
vm:write_to_map()
--------------------------------------------------
for _, value in pairs(ctf_map.map.teams) do for _, value in pairs(ctf_map.map.teams) do
ctf_team_base.place(value.color, value.pos) ctf_team_base.place(value.color, value.pos)
end end
@ -110,6 +102,11 @@ function ctf_map.place_map(map)
irc:say("Map: " .. map.name) irc:say("Map: " .. map.name)
end end
end) end)
minetest.after(10, function()
minetest.fix_light(ctf_map.map.pos1, ctf_map.map.pos2)
end)
end, nil)
end end
function ctf_match.load_map_meta(idx, name) function ctf_match.load_map_meta(idx, name)
@ -132,7 +129,7 @@ function ctf_match.load_map_meta(idx, name)
chests = {}, chests = {},
} }
assert(map.r <= max_r and map.h <= max_h) assert(map.r <= max_r)
map.pos1 = vector.add(offset, { x = -map.r, y = -map.h / 2, z = -map.r }) map.pos1 = vector.add(offset, { x = -map.r, y = -map.h / 2, z = -map.r })
map.pos2 = vector.add(offset, { x = map.r, y = map.h / 2, z = map.r }) map.pos2 = vector.add(offset, { x = map.r, y = map.h / 2, z = map.r })