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

Deprecate helper.wml_error and move it to wml.error

Browse source
This commit is contained in:
Celtic Minstrel 2018-03-24 13:30:12 -04:00 • committed by Celtic Minstrel
parent 8bcf749666
commit 6d7736e6e6
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/lua/core.lua
View file

@ -232,6 +232,13 @@ function wesnoth.deprecate_api(elem_name, replacement, level, version, elem, det
end end
if wesnoth.kernel_type() == "Game Lua Kernel" then if wesnoth.kernel_type() == "Game Lua Kernel" then
--[========[WML error helper]========]
--! Interrupts the current execution and displays a chat message that looks like a WML error.
function wml.error(m)
error("~wml:" .. m, 0)
end
--[========[Basic variable access]========] --[========[Basic variable access]========]
-- Get all variables via wml.all_variables (read-only) -- Get all variables via wml.all_variables (read-only)

6
data/lua/helper.lua
View file

@ -19,11 +19,6 @@ function helper.get_sides(cfg)
return f, { i = 0 } return f, { i = 0 }
end end
--! Interrupts the current execution and displays a chat message that looks like a WML error.
function helper.wml_error(m)
error("~wml:" .. m, 0)
end
--! Returns an iterator over teams that can be used in a for-in loop. --! Returns an iterator over teams that can be used in a for-in loop.
function helper.all_teams() function helper.all_teams()
local function f(s) local function f(s)
@ -234,6 +229,7 @@ if wesnoth.kernel_type() == "Game Lua Kernel" then
helper.get_variable_array = wesnoth.deprecate_api('helper.get_variable_array', ' wml.array_access.get', 1, nil, wml.array_access.get) helper.get_variable_array = wesnoth.deprecate_api('helper.get_variable_array', ' wml.array_access.get', 1, nil, wml.array_access.get)
helper.set_variable_array = wesnoth.deprecate_api('helper.set_variable_array', 'wml.array_access.set', 1, nil, wml.array_access.set) helper.set_variable_array = wesnoth.deprecate_api('helper.set_variable_array', 'wml.array_access.set', 1, nil, wml.array_access.set)
helper.get_variable_proxy_array = wesnoth.deprecate_api('helper.get_variable_proxy_array', 'wml.array_access.get_proxy', 1, nil, wml.array_access.get_proxy) helper.get_variable_proxy_array = wesnoth.deprecate_api('helper.get_variable_proxy_array', 'wml.array_access.get_proxy', 1, nil, wml.array_access.get_proxy)
helper.wml_error = wesnoth.deprecate_api('helper.wml_error', 'wml.error', 1, nil, wml.error)
end end
helper.literal = wesnoth.deprecate_api('helper.literal', 'wml.literal', 1, nil, wml.literal) helper.literal = wesnoth.deprecate_api('helper.literal', 'wml.literal', 1, nil, wml.literal)
helper.parsed = wesnoth.deprecate_api('helper.parsed', 'wml.parsed', 1, nil, wml.parsed) helper.parsed = wesnoth.deprecate_api('helper.parsed', 'wml.parsed', 1, nil, wml.parsed)