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

only use Self for internal self references

Browse Source
This commit is contained in:
Matthias Mailänder
2013-11-02 17:47:25 +01:00
parent be1ab707c5
commit 05eae2c890
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Orders
.Where(o => o != null) .Where(o => o != null)
.ToArray(); .ToArray();
var actorsInvolved = orders.Select(o => o.Self).Distinct(); var actorsInvolved = orders.Select(o => o.Actor).Distinct();
if (actorsInvolved.Any()) if (actorsInvolved.Any())
yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false) yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false)
{ {
@@ -49,7 +49,7 @@ namespace OpenRA.Orders
}; };
foreach (var o in orders) foreach (var o in orders)
yield return CheckSameOrder(o.Order, o.Trait.IssueOrder(o.Self, o.Order, o.Target, mi.Modifiers.HasModifier(Modifiers.Shift))); yield return CheckSameOrder(o.Order, o.Trait.IssueOrder(o.Actor, o.Order, o.Target, mi.Modifiers.HasModifier(Modifiers.Shift)));
} }
public void Tick(World world) { } public void Tick(World world) { }
@@ -137,15 +137,15 @@ namespace OpenRA.Orders
class UnitOrderResult class UnitOrderResult
{ {
public readonly Actor Self; public readonly Actor Actor;
public readonly IOrderTargeter Order; public readonly IOrderTargeter Order;
public readonly IIssueOrder Trait; public readonly IIssueOrder Trait;
public readonly string Cursor; public readonly string Cursor;
public readonly Target Target; public readonly Target Target;
public UnitOrderResult(Actor self, IOrderTargeter order, IIssueOrder trait, string cursor, Target target) public UnitOrderResult(Actor actor, IOrderTargeter order, IIssueOrder trait, string cursor, Target target)
{ {
this.Self = self; this.Actor = actor;
this.Order = order; this.Order = order;
this.Trait = trait; this.Trait = trait;
this.Cursor = cursor; this.Cursor = cursor;