upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 12:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed lua [teleport] code

Browse Source 
And changed [unstore_unit] to use table.unpack for shorter code
This commit is contained in:
MrTitainin 2021-02-11 19:45:21 +01:00 committed by GitHub
parent add999b9d5
commit 8db66e8551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/lua/wml-tags.lua
View File

@ -839,8 +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
local loc = wesnoth.special_locations[cfg.location_id]
x,y = loc[1], loc[2]
x,y = table.unpack(wesnoth.special_locations[cfg.location_id])
end
wesnoth.add_known_unit(unit.type)
if on_board(x, y) then
@ -878,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)