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

Fix accidental inclusion of 5.0-only methods

Browse source
This commit is contained in:
ClobberXD 2018-11-20 18:52:44 +05:30 committed by rubenwardy
parent 5b3efd8909
commit def3b99150
1 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
mods/ctf_map/map_maker.lua
View file

@ -1,19 +1,41 @@
local randint = math.random(100) local randint = math.random(100)
-- Load map metadata from mod_storage if it exists -- Reload mapmaker context from mod_storage if it exists
local storage = minetest.get_mod_storage() local storage = minetest.get_mod_storage()
local mapname = storage:get("mapname") or "ctf_" .. randint local mapname = storage:get_string("mapname")
local maptitle = storage:get("maptitle") or "Untitled Map " .. randint local maptitle = storage:get_string("maptitle")
local mapauthor = storage:get("mapauthor") local mapauthor = storage:get_string("mapauthor")
local mapinitial = storage:get_string("mapinitial") local mapinitial = storage:get_string("mapinitial")
local center = storage:get_string("center")
local flag_positions = storage:get_string("flags")
local barrier_r = storage:get_int("barrier_r")
local center_barrier_rot = storage:get_int("center_barrier_rot") local center_barrier_rot = storage:get_int("center_barrier_rot")
local barrier_r = storage:contains("barrier_r")
and storage:get_int("barrier_r") or 110 if mapname == "" then
local center = storage:contains("center") mapname = "ctf_" .. randint
and minetest.parse_json(storage:get("center")) end
or { x = 0, y = 0, z = 0, r = 115, h = 140 } if mapauthor == "" then
local flag_positions = storage:contains("flags") mapauthor = nil
and minetest.parse_json(storage:get("flags")) or {} end
if maptitle == "" then
maptitle = "Untitled Map " .. randint
end
if barrier_r == 0 then
barrier_r = 110
end
if center == "" then
center = { x = 0, y = 0, z = 0, r = 115, h = 140 }
else
center = minetest.parse_json(storage:get("center"))
end
if flag_positions == "" then
flag_positions = {}
else
minetest.parse_json(storage:get("flags"))
end
--------------------------------------------------------------------------------
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
minetest.after(1, function(name) minetest.after(1, function(name)