epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.IsDead() includes the .Destroyed check

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/AI/HackyAI.cs
View File

@@ -479,7 +479,7 @@ namespace OpenRA.Mods.RA.AI
{ {
squads.RemoveAll(s => !s.IsValid); squads.RemoveAll(s => !s.IsValid);
foreach (var s in squads) 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 // 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) void AssignRolesToIdleUnits(Actor self)
{ {
CleanSquads(); CleanSquads();
activeUnits.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p); activeUnits.RemoveAll(a => a.IsDead() || a.Owner != p);
unitsHangingAroundTheBase.RemoveAll(a => a.Destroyed || a.IsDead() || a.Owner != p); unitsHangingAroundTheBase.RemoveAll(a => a.IsDead() || a.Owner != p);
if (--rushTicks <= 0) if (--rushTicks <= 0)
{ {

2
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -87,7 +87,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
show = false; show = false;
if (!self.IsInWorld || self.Destroyed || self.IsDead() || self.World.RenderPlayer == null) if (!self.IsInWorld || self.IsDead() || self.World.RenderPlayer == null)
return; return;
var gps = watcher[self.World.RenderPlayer]; var gps = watcher[self.World.RenderPlayer];

2
OpenRA.Mods.RA/Effects/InvulnEffect.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Effects
public void Tick( World world ) public void Tick( World world )
{ {
if (a.Destroyed || a.IsDead() || b.GetDamageModifier(null, null) > 0) if (a.IsDead() || b.GetDamageModifier(null, null) > 0)
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
} }