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

Explicitly implement interfaces in Disguise trait.

Browse Source
This commit is contained in:
Paul Chote
2017-10-21 18:27:47 +01:00
committed by reaperrr
parent bfe540cd8b
commit c9c7c5744c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Cnc.Traits
conditionManager = self.TraitOrDefault<ConditionManager>(); conditionManager = self.TraitOrDefault<ConditionManager>();
} }
public IEnumerable<IOrderTargeter> Orders IEnumerable<IOrderTargeter> IIssueOrder.Orders
{ {
get get
{ {
@@ -121,7 +121,7 @@ namespace OpenRA.Mods.Cnc.Traits
} }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) Order IIssueOrder.IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order.OrderID == "Disguise") if (order.OrderID == "Disguise")
return new Order(order.OrderID, self, target, queued); return new Order(order.OrderID, self, target, queued);
@@ -129,7 +129,7 @@ namespace OpenRA.Mods.Cnc.Traits
return null; return null;
} }
public void ResolveOrder(Actor self, Order order) void IResolveOrder.ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Disguise") if (order.OrderString == "Disguise")
{ {
@@ -138,12 +138,12 @@ namespace OpenRA.Mods.Cnc.Traits
} }
} }
public string VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
return order.OrderString == "Disguise" ? info.Voice : null; return order.OrderString == "Disguise" ? info.Voice : null;
} }
public Color RadarColorOverride(Actor self, Color color) Color IRadarColorModifier.RadarColorOverride(Actor self, Color color)
{ {
if (!Disguised || self.Owner.IsAlliedWith(self.World.RenderPlayer)) if (!Disguised || self.Owner.IsAlliedWith(self.World.RenderPlayer))
return color; return color;