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

Lua: Fix nil-safety issues in location_set

Browse source 
Fixes #6231

(cherry picked from commit 1f32466782)
This commit is contained in:
Celtic Minstrel 2021-10-26 13:44:27 -04:00 • committed by Wedge009
parent e2810bf96f
commit 73983c7032
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/lua/location_set.lua
View file

@ -92,18 +92,25 @@ end
function methods:get(...)
local loc = wesnoth.map.read_location(...)
return self.values[index(loc.x, loc.y)]
if loc ~= nil then
return self.values[index(loc.x, loc.y)]
end
return nil
end
function methods:insert(...)
local loc, n = wesnoth.map.read_location(...)
local v = select(n + 1, ...)
self.values[index(loc.x, loc.y)] = v or true
if loc ~= nil then
local v = select(n + 1, ...)
self.values[index(loc.x, loc.y)] = v or true
end
end
function methods:remove(...)
local loc = wesnoth.map.read_location(...)
self.values[index(loc.x, loc.y)] = nil
if loc ~= nil then
self.values[index(loc.x, loc.y)] = nil
end
end
function methods:clone()