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

Accept delayed_variable_substitution=no in [tunnel] ActionWML

Browse source
This commit is contained in:
Celtic Minstrel 2017-02-26 19:28:22 -05:00
parent 6af3dd91b8
commit c778a007af
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_events/action_wml.cpp
View file

@ -857,6 +857,7 @@ WML_HANDLER_FUNCTION(terrain_mask,, cfg)
WML_HANDLER_FUNCTION(tunnel,, cfg)
{
const bool remove = cfg["remove"].to_bool(false);
const bool delay = cfg["delayed_variable_substitution"].to_bool(true);
if (remove) {
const std::vector<std::string> ids = utils::split(cfg["id"]);
for (const std::string &id : ids) {
@ -868,11 +869,11 @@ WML_HANDLER_FUNCTION(tunnel,, cfg)
ERR_WML << "[tunnel] is missing a mandatory tag:\n"
<< cfg.get_config().debug();
} else {
pathfind::teleport_group tunnel(cfg, false);
pathfind::teleport_group tunnel(delay ? cfg : vconfig(cfg.get_parsed_config()), false);
resources::tunnels->add(tunnel);
if(cfg["bidirectional"].to_bool(true)) {
tunnel = pathfind::teleport_group(cfg, true);
tunnel = pathfind::teleport_group(delay ? cfg : vconfig(cfg.get_parsed_config()), true);
resources::tunnels->add(tunnel);
}
}