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

Better action WML error handling

Browse source
This commit is contained in:
Tóth Kornél 2024-10-12 22:23:52 +02:00 • committed by GitHub
parent 28414a933d
commit 76f20a6149
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
data/lua/wml-utils.lua
View file

@ -130,19 +130,24 @@ function utils.handle_event_commands(cfg, scope_type)
arg = wml.tovconfig(arg)
end
if not string.find(cmd, "^filter") then
cmd = wesnoth.wml_actions[cmd] or
local cmd_f = wesnoth.wml_actions[cmd] or
wml.error(string.format("[%s] not supported", cmd))
if insert_from then
local j = 0
repeat
cmd(arg)
if current_exit ~= "none" then break end
j = j + 1
if j >= wml.variables[insert_from .. ".length"] then break end
arg = wml.tovconfig(wml.variables[string.format("%s[%d]", insert_from, j)])
until false
else
cmd(arg)
local success, error = pcall(function()
if insert_from then
local j = 0
repeat
cmd_f(arg)
if current_exit ~= "none" then break end
j = j + 1
if j >= wml.variables[insert_from .. ".length"] then break end
arg = wml.tovconfig(wml.variables[string.format("%s[%d]", insert_from, j)])
until false
else
cmd_f(arg)
end
end)
if not success then
wml.error(string.format("Error occured inside [%s]: %s", cmd, error))
end
end
if current_exit ~= "none" then break end