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

Lua: Fix deprecate_api changing the behaviour of tables with an __index metamethod

Browse source
This commit is contained in:
Celtic Minstrel 2019-11-23 14:44:25 -05:00
parent 3734bce276
commit 859ab37254
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/lua/core.lua
View file

@ -216,6 +216,8 @@ function wesnoth.deprecate_api(elem_name, replacement, level, version, elem, det
msg_shown = true msg_shown = true
wesnoth.deprecated_message(elem_name, level, version, message) wesnoth.deprecated_message(elem_name, level, version, message)
end end
local val = elem[key]
if val then return val end
if type(old_mt) == "table" then if type(old_mt) == "table" then
if type(old_mt.__index) == 'function' then if type(old_mt.__index) == 'function' then
return old_mt.__index(self, key) return old_mt.__index(self, key)
@ -227,7 +229,6 @@ function wesnoth.deprecate_api(elem_name, replacement, level, version, elem, det
wml.error('The wrapped __index metamethod of a deprecated object is neither a function nor a table') wml.error('The wrapped __index metamethod of a deprecated object is neither a function nor a table')
end end
end end
return elem[key]
end end
mt.__newindex = function(self, key, val) mt.__newindex = function(self, key, val)
if not msg_shown then if not msg_shown then