upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 09:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: Fix a bug when calling wesnoth.deprecate_api on a table that had a metatable.

Browse Source 
The old metatable was used as the metatable of the new element's
metatable, which doesn't make any sense at all.

Fixes #4079
This commit is contained in:
josteph 2019-09-23 15:37:14 +00:00 committed by jostephd
parent 1f66baca84
commit 56131f14c4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data/lua/core.lua
View File

@ -202,12 +202,17 @@ function wesnoth.deprecate_api(elem_name, replacement, level, version, elem, det
return elem(...)
end
elseif type(elem) == "table" then
-- Don't clobber the old metatable.
local old_mt = getmetatable(elem)
local mt = {
__index = function(self, key)
if not msg_shown then
msg_shown = true
wesnoth.deprecated_message(elem_name, level, version, message)
end
if type(old_mt) == "table" and old_mt.__index ~= nil then
return old_mt.__index(self, key)
end
return elem[key]
end,
__newindex = function(self, key, val)
@ -215,14 +220,12 @@ function wesnoth.deprecate_api(elem_name, replacement, level, version, elem, det
msg_shown = true
wesnoth.deprecated_message(elem_name, level, version, message)
end
if type(old_mt) == "table" and old_mt.__newindex ~= nil then
return old_mt.__newindex(self, key, val)
end
elem[key] = val
end,
}
-- Don't clobber the old metatable.
local old_mt = getmetatable(elem)
if type(old_mt) == "table" then
setmetatable(mt, old_mt)
end
return setmetatable({}, mt)
else
wesnoth.log('warn', "Attempted to deprecate something that is not a table or function: " ..