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

Merge pull request #8226 from pchote/actor-disposal

Browse Source 
Dispose traits when destroying an actor.
This commit is contained in:
Oliver Brakmann
2015-06-02 19:33:22 +02:00
parent 62aee92185 8ae3afa3c5
commit 206c33ed41
54 changed files with 138 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/Infiltrate.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Activities
foreach (var t in target.TraitsImplementing<INotifyInfiltrated>())
t.Infiltrated(target, self);
self.Destroy();
self.Dispose();
if (target.HasTrait<Building>())
Sound.PlayToPlayer(self.Owner, "bldginf1.aud");

2
OpenRA.Mods.RA/Activities/Teleport.cs
View File

@@ -90,7 +90,7 @@ namespace OpenRA.Mods.RA.Activities
foreach (var a in self.World.ActorsWithTrait<ChronoshiftPaletteEffect>())
a.Trait.Enable();
if (teleporter != null && self != teleporter && !teleporter.Destroyed)
if (teleporter != null && self != teleporter && !teleporter.Disposed)
{
var building = teleporter.TraitOrDefault<RenderBuilding>();
if (building != null)

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

@@ -89,7 +89,7 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world)
{
if (self.Destroyed)
if (self.Disposed)
world.AddFrameEndTask(w => w.Remove(this));
show = false;
@@ -102,7 +102,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
if (!show || self.Destroyed)
if (!show || self.Disposed)
return SpriteRenderable.None;
var palette = wr.Palette(info.IndicatorPalettePrefix + self.Owner.InternalName);

2
OpenRA.Mods.RA/Traits/Chronoshiftable.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Traits
self.World.AddFrameEndTask(w =>
{
// damage is inflicted by the chronosphere
if (!self.Destroyed)
if (!self.Disposed)
self.InflictDamage(chronosphere, int.MaxValue, null);
});
return true;