From 05eae2c890026e42bedcd0264f2530a54a911ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 2 Nov 2013 17:47:25 +0100 Subject: [PATCH] only use Self for internal self references --- OpenRA.Game/Orders/UnitOrderGenerator.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs index 3782a2fd59..da741d7a87 100644 --- a/OpenRA.Game/Orders/UnitOrderGenerator.cs +++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs @@ -41,7 +41,7 @@ namespace OpenRA.Orders .Where(o => o != null) .ToArray(); - var actorsInvolved = orders.Select(o => o.Self).Distinct(); + var actorsInvolved = orders.Select(o => o.Actor).Distinct(); if (actorsInvolved.Any()) yield return new Order("CreateGroup", actorsInvolved.First().Owner.PlayerActor, false) { @@ -49,7 +49,7 @@ namespace OpenRA.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) { } @@ -137,15 +137,15 @@ namespace OpenRA.Orders class UnitOrderResult { - public readonly Actor Self; + public readonly Actor Actor; public readonly IOrderTargeter Order; public readonly IIssueOrder Trait; public readonly string Cursor; 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.Trait = trait; this.Cursor = cursor;