minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Fix lighting glitches on LVM map caused by engine mapgen"

Browse source 
This reverts commit ae8005a1f4.
This commit is contained in:
rubenwardy 2018-07-19 22:16:48 +01:00
parent c7a8998b7c
commit 35da0ca3fe
No known key found for this signature in database
GPG key ID: A1E29D52FF81513C
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mods/ctf_map/schem_map.lua
View file

@ -1,4 +1,4 @@
minetest.set_mapgen_params({mgname = "singlenode", flags = "nolight"}) assert(minetest.get_mapgen_setting("mg_name") == "singlenode", "singlenode mapgen is required.")
minetest.register_alias("mapgen_singlenode", "ctf_map:ignore") minetest.register_alias("mapgen_singlenode", "ctf_map:ignore")
minetest.register_alias("ctf_map:flag", "air") minetest.register_alias("ctf_map:flag", "air")
@ -23,6 +23,7 @@ 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
@ -74,25 +75,23 @@ minetest.register_chatcommand("maps_reload", {
function ctf_map.place_map(map) function ctf_map.place_map(map)
local schempath = mapdir .. map.schematic local schempath = mapdir .. map.schematic
-- --------------------------------------------------
-- Place schematic -- LVM
--
local vm = minetest.get_voxel_manip(map.pos1, map.pos2) local vm = minetest.get_voxel_manip(map.pos1, map.pos2)
local res = minetest.place_schematic_on_vmanip(vm, map.pos1, schempath, 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() vm:write_to_map()
-- --------------------------------------------------
-- Create bases
--
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
--
-- Place flags
--
local seed = minetest.get_mapgen_setting("seed") local seed = minetest.get_mapgen_setting("seed")
for _, chestzone in pairs(ctf_map.map.chests) do for _, chestzone in pairs(ctf_map.map.chests) do
minetest.log("warning", "Placing " .. chestzone.n .. " chests from " .. minetest.log("warning", "Placing " .. chestzone.n .. " chests from " ..
@ -101,9 +100,6 @@ function ctf_map.place_map(map)
place_chests(chestzone.from, chestzone.to, seed, chestzone.n) place_chests(chestzone.from, chestzone.to, seed, chestzone.n)
end end
--
-- Wait then send map messages (avoids "X joined blue" spam)
--
minetest.after(2, function() minetest.after(2, function()
local msg = "Map: " .. map.name .. " by " .. map.author local msg = "Map: " .. map.name .. " by " .. map.author
if map.hint then if map.hint then
@ -136,7 +132,7 @@ function ctf_match.load_map_meta(idx, name)
chests = {}, chests = {},
} }
assert(map.r <= max_r) assert(map.r <= max_r and map.h <= max_h)
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 })