0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Lua] Make wesnoth.read_location return its result in standard named tuple format

Browse source
This commit is contained in:
Celtic Minstrel 2024-02-05 09:07:38 -05:00 • committed by Celtic Minstrel
parent 9548f4c7b5
commit d734bfb9e2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/lua/core/map.lua
View file

@ -27,9 +27,9 @@ function wesnoth.map.read_location(...)
else
return nil, 0
end
return {x = x, y = y}, 1
return wesnoth.named_tuple({x, y}, {'x', 'y'}), 1
elseif type(x) == 'number' and type(y) == 'number' then
return {x = x, y = y}, 2
return wesnoth.named_tuple({x, y}, {'x', 'y'}), 2
end
return nil, 0
end
@ -269,9 +269,12 @@ if wesnoth.kernel_type() == "Game Lua Kernel" then
---@return terrain_hex
---@overload fun(loc:location):terrain_hex
function wesnoth.map.get(x, y)
-- Make the linter assume the location is non-nil.
-- It's not smart enough to realize that n==0 means that loc is non-nil.
---@type location
local loc, n = wesnoth.map.read_location(x, y)
if n == 0 then error('Missing or invalid coordinate') end
return setmetatable(loc, hex_mt)
return setmetatable({x = loc.x, y = loc.y}, hex_mt)
end
local find_locations = wesnoth.map.find