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

Remove duplication between Immobile and Mine.

Browse Source
This commit is contained in:
Paul Chote
2014-03-20 21:21:26 +13:00
parent 715e0299bf
commit 4b09ecd630
7 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.RA/Mine.cs
View File

@@ -25,17 +25,15 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new Mine(init, this); }
}
class Mine : ICrushable, IOccupySpace, ISync, INotifyAddedToWorld, INotifyRemovedFromWorld
class Mine : ICrushable
{
readonly Actor self;
readonly MineInfo info;
[Sync] readonly CPos location;
public Mine(ActorInitializer init, MineInfo info)
{
this.self = init.self;
this.info = info;
this.location = init.Get<LocationInit,CPos>();
}
public void WarnCrush(Actor crusher) {}
@@ -56,25 +54,6 @@ namespace OpenRA.Mods.RA
{
return info.CrushClasses.Intersect(crushClasses).Any();
}
public CPos TopLeft { get { return location; } }
public IEnumerable<Pair<CPos, SubCell>> OccupiedCells() { yield return Pair.New(TopLeft, SubCell.FullCell); }
public WPos CenterPosition { get { return location.CenterPosition; } }
public void AddedToWorld(Actor self)
{
self.World.ActorMap.AddInfluence(self, this);
self.World.ActorMap.AddPosition(self, this);
self.World.ScreenMap.Add(self);
}
public void RemovedFromWorld(Actor self)
{
self.World.ActorMap.RemoveInfluence(self, this);
self.World.ActorMap.RemovePosition(self, this);
self.World.ScreenMap.Remove(self);
}
}
/* tag trait for stuff that shouldnt trigger mines */