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

Some misc explicit interfaces

Browse Source 
Just a by-product from a previous commit, not meant to do anything specific other than bringing us a tiny step closer to requiring explicit implementations for these interfaces too, at some point.
This commit is contained in:
reaperrr
2017-09-07 17:47:32 +02:00
committed by Matthias Mailänder
parent 761a4f29ab
commit 83afcc3448
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Traits/AttackMove.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits
assaultMoveToken = conditionManager.RevokeCondition(self, assaultMoveToken); assaultMoveToken = conditionManager.RevokeCondition(self, assaultMoveToken);
} }
public string VoicePhraseForOrder(Actor self, Order order) string IOrderVoice.VoicePhraseForOrder(Actor self, Order order)
{ {
if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove") if (order.OrderString == "AttackMove" || order.OrderString == "AssaultMove")
return info.Voice; return info.Voice;

6
OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -145,13 +145,13 @@ namespace OpenRA.Mods.Common.Traits
ApplyStanceCondition(self); ApplyStanceCondition(self);
} }
public void ResolveOrder(Actor self, Order order) void IResolveOrder.ResolveOrder(Actor self, Order order)
{ {
if (order.OrderString == "SetUnitStance" && Info.EnableStances) if (order.OrderString == "SetUnitStance" && Info.EnableStances)
SetStance(self, (UnitStance)order.ExtraData); SetStance(self, (UnitStance)order.ExtraData);
} }
public void Damaged(Actor self, AttackInfo e) void INotifyDamage.Damaged(Actor self, AttackInfo e)
{ {
if (IsTraitDisabled || !self.IsIdle || Stance < UnitStance.ReturnFire) if (IsTraitDisabled || !self.IsIdle || Stance < UnitStance.ReturnFire)
return; return;
@@ -210,7 +210,7 @@ namespace OpenRA.Mods.Common.Traits
return true; return true;
} }
public void Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (IsTraitDisabled) if (IsTraitDisabled)
return; return;