Kill Controller

This commit is contained in:
Paul Chote
2010-07-25 19:21:53 +12:00
parent e677be7908
commit 305fa03355
31 changed files with 208 additions and 234 deletions

View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Activities
self.World.AddFrameEndTask(w =>
{
var selected = Game.controller.selection.Contains(self);
var selected = w.Selection.Contains(self);
self.World.Remove(self);
foreach (var s in sounds)
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Activities
a.Health = GetHealthToTransfer(self, a, transferPercentage);
if (selected)
Game.controller.selection.Add(w, a);
w.Selection.Add(w, a);
});
return this;
}

View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Activities
void DoUndeploy(World w, Actor self)
{
var selected = Game.controller.selection.Contains(self);
var selected = w.Selection.Contains(self);
w.Remove(self);
var mcv = w.CreateActor("mcv", self.Location + new int2(1, 1), self.Owner);
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Activities
mcv.traits.Get<Unit>().Facing = 96;
if (selected)
Game.controller.selection.Add(w, mcv);
w.Selection.Add(w, mcv);
}
public IActivity Tick(Actor self)