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

Fix some issues with [test_condition]

Browse source
This commit is contained in:
Celtic Minstrel 2015-10-06 16:17:14 -04:00
parent 4167530c37
commit 9d3f1e5c9d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/lua/wml-tags.lua
View file

@ -514,11 +514,11 @@ function wml_actions.test_condition(cfg)
local tag, this_cfg = t[1], t[2]
-- Some special cases
if tag == "or" or tag == "and" then
if explain(current_cfg, expect) then
if explain(this_cfg, expect) then
return true
end
elseif tag == "not" then
if explain(current_cfg, not expect) then
if explain(this_cfg, not expect) then
return true
end
elseif tag == "true" or tag == "false" then
@ -537,7 +537,7 @@ function wml_actions.test_condition(cfg)
local format = "%s\n\t\t%s=%s"
local literal = tostring(helper.literal(this_cfg)[k])
if literal ~= v then
format = format + "=%s"
format = format .. "=%s"
end
explanation = string.format(format, explanation, k, literal, tostring(v))
end