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

Merge pull request #9264 from penev92/appearsOnRadar

Browse Source 
Make AppearsOnRadar implement INotifyCreated
This commit is contained in:
reaperrr
2015-09-05 00:39:33 +02:00
parent e44342daa0 c323046ed0
commit e0e31d89b1
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Traits/AppearsOnRadar.cs
View File

@@ -23,21 +23,29 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new AppearsOnRadar(this); } public object Create(ActorInitializer init) { return new AppearsOnRadar(this); }
} }
public class AppearsOnRadar : IRadarSignature public class AppearsOnRadar : IRadarSignature, INotifyCreated
{ {
AppearsOnRadarInfo info; readonly AppearsOnRadarInfo info;
IRadarColorModifier modifier;
public AppearsOnRadar(AppearsOnRadarInfo info) { this.info = info; } public AppearsOnRadar(AppearsOnRadarInfo info)
{
this.info = info;
}
public void Created(Actor self)
{
modifier = self.TraitsImplementing<IRadarColorModifier>().FirstOrDefault();
}
public IEnumerable<Pair<CPos, Color>> RadarSignatureCells(Actor self) public IEnumerable<Pair<CPos, Color>> RadarSignatureCells(Actor self)
{ {
var mod = self.TraitsImplementing<IRadarColorModifier>().FirstOrDefault(); var color = modifier != null ? modifier.RadarColorOverride(self) : self.Owner.Color.RGB;
var color = mod != null ? mod.RadarColorOverride(self) : self.Owner.Color.RGB;
if (info.UseLocation) if (info.UseLocation)
return new[] { Pair.New(self.Location, color) }; return new[] { Pair.New(self.Location, color) };
else
return self.OccupiesSpace.OccupiedCells().Select(c => Pair.New(c.First, color)); return self.OccupiesSpace.OccupiedCells().Select(c => Pair.New(c.First, color));
} }
} }
} }