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

Bugfixes in [role] tag

Browse source 
The following fixes were applied:
* cfg.__shallow_literal -> helper.shallow_literal, to allow calling the tag
  from Lua as wesnoth.wml_actions.role
* added trim() to the for cycle
* deleted filter.role and filter.type after having copied their data, because
  when calling the tag from Lua they ended up being deleted too early
* unit.role = cfg.role -> unit.role = role
This commit is contained in:
Elvish_Hunter 2015-06-13 21:19:56 +02:00
parent 787bd1b9c5
commit 79d44d0486
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1465,14 +1465,15 @@ function wml_actions.role(cfg)
-- role= and type= are handled differently than in other tags,
-- so we need to remove them from the filter
local role = cfg.role
local filter = cfg.__shallow_literal
filter.role, filter.type = nil, nil
local filter = helper.shallow_literal(cfg)
local types = {}
for value in split(cfg.type) do
table.insert(types, value)
table.insert(types, trim(value))
end
filter.role, filter.type = nil, nil
-- first attempt to match units on the map
local i = 1
repeat
@ -1482,7 +1483,7 @@ function wml_actions.role(cfg)
end
local unit = wesnoth.get_units(filter)[1]
if unit then
unit.role = cfg.role
unit.role = role
return
end
i = i + 1
@ -1496,7 +1497,7 @@ function wml_actions.role(cfg)
end
local unit = wesnoth.get_recall_units(filter)[1]
if unit then
unit.role = cfg.role
unit.role = role
return
end
i = i + 1