.IsDead() includes the .Destroyed check

This commit is contained in:
Matthias Mailänder
2013-11-17 23:32:32 +01:00
parent 8a13cd6c6a
commit da235d7aee
3 changed files with 5 additions and 5 deletions

View File

@@ -479,7 +479,7 @@ namespace OpenRA.Mods.RA.AI
{
squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads)
s.units.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
s.units.RemoveAll(a => a.IsDead() || a.Owner != p);
}
// Use of this function requires that one squad of this type. Hence it is a piece of shit
@@ -506,8 +506,8 @@ namespace OpenRA.Mods.RA.AI
void AssignRolesToIdleUnits(Actor self)
{
CleanSquads();
activeUnits.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p);
activeUnits.RemoveAll(a => a.IsDead() || a.Owner != p);
unitsHangingAroundTheBase.RemoveAll(a => a.IsDead() || a.Owner != p);
if (--rushTicks <= 0)
{