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

ai_helper check unit functions: also check if unit exists

Browse source
This commit is contained in:
mattsc 2016-10-10 07:42:15 -07:00
parent 4cc22e1258
commit c91a65dde4
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/ai/lua/ai_helper.lua
View file

@ -963,7 +963,7 @@ function ai_helper.get_visible_units(viewing_side, filter)
end
function ai_helper.is_visible_unit(viewing_side, unit)
-- Check whether @unit is visible to side @viewing_side
-- Check whether @unit exists and is visible to side @viewing_side.
--
-- Required parameters:
-- @viewing_side: see comments at beginning of this file.
@ -973,6 +973,8 @@ function ai_helper.is_visible_unit(viewing_side, unit)
error('ai_helper.is_visible_unit() is missing required parameter viewing_side.')
end
if (not unit) then return false end
if wesnoth.sides[viewing_side]
and unit:matches({ { "filter_vision", { side = viewing_side, visible = 'no' } } })
then
@ -1021,7 +1023,7 @@ function ai_helper.get_attackable_enemies(filter, side, cfg)
end
function ai_helper.is_attackable_enemy(unit, side, cfg)
-- Check if @unit is an enemy of @side, is visible to the side defined
-- Check if @unit exists, is an enemy of @side, is visible to the side defined
-- in @cfg.viewing_side and is not petrified.
--
-- Optional parameters:
@ -1032,7 +1034,8 @@ function ai_helper.is_attackable_enemy(unit, side, cfg)
side = side or wesnoth.current.side
local viewing_side = cfg and cfg.viewing_side or side
if (not wesnoth.is_enemy(side, unit.side))
if (not unit)
or (not wesnoth.is_enemy(side, unit.side))
or unit.status.petrified
or (not ai_helper.is_visible_unit(viewing_side, unit))
then