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

Made some interface implementations in Mobile explicit

Browse Source
This commit is contained in:
reaperrr
2018-05-05 03:31:13 +02:00
parent 98289d8573
commit 545ca5da61
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -591,8 +591,8 @@ namespace OpenRA.Mods.Common.Traits
if (!inits.Contains<DynamicFacingInit>() && !inits.Contains<FacingInit>()) if (!inits.Contains<DynamicFacingInit>() && !inits.Contains<FacingInit>())
inits.Add(new DynamicFacingInit(() => facing)); inits.Add(new DynamicFacingInit(() => facing));
} }
public void ModifyDeathActorInit(Actor self, TypeDictionary init) void IDeathActorInitModifier.ModifyDeathActorInit(Actor self, TypeDictionary init)
{ {
init.Add(new FacingInit(facing)); init.Add(new FacingInit(facing));
@@ -617,10 +617,10 @@ namespace OpenRA.Mods.Common.Traits
Nudge(self, blocking, true); Nudge(self, blocking, true);
} }
public IEnumerable<IOrderTargeter> Orders { get { yield return new MoveOrderTargeter(self, this); } } IEnumerable<IOrderTargeter> IIssueOrder.Orders { get { yield return new MoveOrderTargeter(self, this); } }
// Note: Returns a valid order even if the unit can't move to the target // Note: Returns a valid order even if the unit can't move to the target
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) Order IIssueOrder.IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
{ {
if (order is MoveOrderTargeter) if (order is MoveOrderTargeter)
return new Order("Move", self, target, queued); return new Order("Move", self, target, queued);
@@ -628,7 +628,7 @@ namespace OpenRA.Mods.Common.Traits
return null; return null;
} }
public void ResolveOrder(Actor self, Order order) void IResolveOrder.ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "Move") if (order.OrderString == "Move")
{ {
@@ -653,7 +653,7 @@ namespace OpenRA.Mods.Common.Traits
Nudge(self, self, true); Nudge(self, self, true);
} }
public string VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(order.TargetLocation)) if (!Info.LocomotorInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(order.TargetLocation))
return null; return null;