finished TraitDictionary. Refactored permanent actor-removal.

OpenRA.Mods.RA/Activities/CaptureBuilding.cs

@@ -34,8 +34,8 @@ namespace OpenRA.Mods.RA.Activities
 				
 				foreach (var t in target.TraitsImplementing<INotifyCapture>())
 					t.OnCapture(target, self, oldOwner, self.Owner);
-				
-				w.Remove(self);
+
+				self.Destroy();
 			});
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/Infiltrate.cs

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA.Activities
 			foreach (var t in target.TraitsImplementing<IAcceptSpy>())
 				t.OnInfiltrate(target, self);
 
-			self.World.AddFrameEndTask(w => w.Remove(self));
+			self.Destroy();
 
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/RepairBuilding.cs

@@ -27,8 +27,8 @@ namespace OpenRA.Mods.RA.Activities
 			if (health.DamageState == DamageState.Undamaged)
 				return NextActivity;
 			
-			target.InflictDamage(self, -health.MaxHP, null);			
-			self.World.AddFrameEndTask(w => w.Remove(self));
+			target.InflictDamage(self, -health.MaxHP, null);
+			self.Destroy();
 
 			return NextActivity;
 		}

OpenRA.Mods.RA/Activities/Transform.cs

@@ -48,11 +48,11 @@ namespace OpenRA.Mods.RA.Activities
 			self.World.AddFrameEndTask(w =>
 			{
 				var selected = w.Selection.Contains(self);
-				
-				self.World.Remove(self);
+
+				self.Destroy();
 				foreach (var s in sounds)
 					Sound.PlayToPlayer(self.Owner, s, self.CenterLocation);
-								
+
 				var init = new TypeDictionary
 				{
 					new LocationInit( self.Location + offset ),

OpenRA.Mods.RA/Crate.cs

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
 			var totalShares = shares.Sum(a => a.Second);
 			var n = self.World.SharedRandom.Next(totalShares);
 
-			self.World.AddFrameEndTask(w => w.Remove(self));
+			self.Destroy();
 			foreach (var s in shares)
 				if (n < s.Second)
 				{
@@ -75,9 +75,9 @@ namespace OpenRA.Mods.RA
 
 		public void Tick(Actor self)
 		{
-			
-			if (++ticks >= self.Info.Traits.Get<CrateInfo>().Lifetime * 25)
-				self.World.AddFrameEndTask(w => w.Remove(self));			
+
+			if( ++ticks >= self.Info.Traits.Get<CrateInfo>().Lifetime * 25 )
+				self.Destroy();
 		}
 
 		public int2 TopLeft { get { return Location; } }

OpenRA.Mods.RA/DemoTruck.cs

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA
 				self.Kill(self);
 				detonatedBy.Owner.Kills++;
 				self.Owner.Deaths++;
-				w.Remove(self);
+				self.Destroy();
 			} );
 		}
 	}

OpenRA.Mods.RA/ReplaceWithActor.cs

@@ -26,8 +26,8 @@ namespace OpenRA.Mods.RA
 		public ReplaceWithActor(Actor self, ReplaceWithActorInfo info)
 		{
 			self.World.AddFrameEndTask(w =>
-			{
-				w.Remove(self);
+			{
+				self.Destroy();
 				w.CreateActor(info.Actor, new TypeDictionary
 				{
 					new LocationInit( self.Location ),

OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA
 						a.QueueActivity(new Fly(order.TargetLocation));
 
 						if (flare != null)
-							a.QueueActivity(new CallFunc(() => Owner.World.AddFrameEndTask(_w => _w.Remove(flare))));
+							a.QueueActivity(new CallFunc(() => flare.Destroy()));
 
 						a.QueueActivity(new FlyOffMap { Interruptible = false });
 						a.QueueActivity(new RemoveSelf());