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

Reintroduce (deprecated) support for [teleport]ignore_passability=,

Browse source 
...check_passability= is ignored if present.

Change my coding style to use tokens as sparely as possible to prevent
conflicts in case of a revert.

I changed that key in 2011-02-27T17:56:05Z!anonymissimus@arcor.de (shame on me...).
This commit is contained in:
Anonymissimus 2011-10-03 20:51:02 +00:00
parent 480f3ed197
commit bf808dc38d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game_events.cpp
View file

@ -897,7 +897,14 @@ WML_HANDLER_FUNCTION(teleport, event_info, cfg)
if (dst == u->get_location() || !resources::game_map->on_board(dst)) return;
const unit* pass_check = NULL;
if (cfg[z_check_passability].to_bool(true))
//@deprecated ignore_passability 1.9.10
const config::attribute_value& ignore_passability = cfg["ignore_passability"];
if (!ignore_passability.blank()) {
WRN_NG << "[teleport]ignore_passability= is deprecated, use check_passability=\n";
if (!ignore_passability.to_bool(false))
pass_check = &*u;
}
else if (cfg[z_check_passability].to_bool(true))
pass_check = &*u;
const map_location vacant_dst = find_vacant_tile(*resources::game_map, *resources::units, dst, pathfind::VACANT_ANY, pass_check);
if (!resources::game_map->on_board(vacant_dst)) return;