Simplify within_limits function

so you don't need a cs degree to read it ^^
This commit is contained in:
cora 2022-09-17 15:31:09 +02:00
parent df8c234def
commit 9a95557ec8

View File

@ -915,23 +915,21 @@ end
-- check if within physical map limits (-30911 to 30927) -- check if within physical map limits (-30911 to 30927)
local within_limits, wmin, wmax = nil, -30913, 30928 local function within_limits(pos, radius)
within_limits = function(pos, radius) local wmin, wmax = -30912, 30928
if mcl_vars then if mcl_vars then
if mcl_vars.mapgen_edge_min and mcl_vars.mapgen_edge_max then if mcl_vars.mapgen_edge_min and mcl_vars.mapgen_edge_max then
wmin, wmax = mcl_vars.mapgen_edge_min, mcl_vars.mapgen_edge_max wmin, wmax = mcl_vars.mapgen_edge_min, mcl_vars.mapgen_edge_max
within_limits = function(pos, radius)
return pos
and (pos.x - radius) > wmin and (pos.x + radius) < wmax
and (pos.y - radius) > wmin and (pos.y + radius) < wmax
and (pos.z - radius) > wmin and (pos.z + radius) < wmax
end
end end
end end
return pos if radius then
and (pos.x - radius) > wmin and (pos.x + radius) < wmax wmin = wmin - radius
and (pos.y - radius) > wmin and (pos.y + radius) < wmax wmax = wmax + radius
and (pos.z - radius) > wmin and (pos.z + radius) < wmax end
for _,v in pairs(pos) do
if v < wmin or v > wmax then return false end
end
return true
end end