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

SUF: Fix infinite recursion in [hides][filter_self][filter_vision]

Browse source 
Fixes #1389
This commit is contained in:
josteph 2018-09-06 14:26:18 +00:00
parent e2c20e5563
commit d513c499f1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/units/filter.cpp
View file

@ -705,7 +705,8 @@ void unit_filter_compound::fill(vconfig cfg)
for (const int viewer : viewers) {
bool fogged = args.context().get_disp_context().get_team(viewer).fogged(args.loc);
bool hiding = args.u.invisible(args.loc) && args.context().get_disp_context().get_team(viewer).is_enemy(args.u.side());
// Check is_enemy() before invisible() to prevent infinite recursion in [abilities][hides][filter_self][filter_vision]
bool hiding = args.context().get_disp_context().get_team(viewer).is_enemy(args.u.side()) && args.u.invisible(args.loc);
bool unit_hidden = fogged || hiding;
if (c["visible"].to_bool(true) != unit_hidden) {
return true;