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

Merge pull request #5521 from MrTitainin/patch-1

Browse source 
Fixed unstore_unit lua code (issue #5519)
This commit is contained in:
Charles Dang 2021-02-14 01:42:50 +11:00 • committed by GitHub
commit 6bb854408c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -839,7 +839,7 @@ wml_actions.unstore_unit = function(cfg)
local x = cfg.x or unit.x or -1
local y = cfg.y or unit.y or -1
if cfg.location_id then
x, y = wesnoth.special_locations[cfg.location_id]
x,y = table.unpack(wesnoth.special_locations[cfg.location_id])
end
wesnoth.add_known_unit(unit.type)
if on_board(x, y) then
@ -877,10 +877,10 @@ wml_actions.teleport = function(cfg)
return
end
local x,y = cfg.x, cfg.y
if not x or not y then
x,y = wesnoth.special_locations[cfg.location_id]
if cfg.location_id then
x,y = table.unpack(wesnoth.special_locations[cfg.location_id])
end
wesnoth.teleport(unit, cfg.x, cfg.y, cfg.check_passability == false, cfg.clear_shroud ~= false, cfg.animate)
wesnoth.teleport(unit, x, y, cfg.check_passability == false, cfg.clear_shroud ~= false, cfg.animate)
end
function wml_actions.remove_sound_source(cfg)