From aebef4f1c84fe2bd06a031952cf6b46f95d64db6 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 3 Oct 2010 07:08:02 +1300 Subject: [PATCH] rename IIssueOrder2 -> IIssueOrder --- OpenRA.Game/Orders/UnitOrderGenerator.cs | 6 +++--- OpenRA.Game/Traits/Mobile.cs | 2 +- OpenRA.Game/Traits/TraitsInterfaces.cs | 2 +- OpenRA.Mods.RA/AttackBase.cs | 2 +- OpenRA.Mods.RA/C4Demolition.cs | 2 +- OpenRA.Mods.RA/Cargo.cs | 2 +- OpenRA.Mods.RA/ChronoshiftDeploy.cs | 2 +- OpenRA.Mods.RA/EngineerCapture.cs | 2 +- OpenRA.Mods.RA/EngineerRepair.cs | 2 +- OpenRA.Mods.RA/Harvester.cs | 2 +- OpenRA.Mods.RA/Helicopter.cs | 2 +- OpenRA.Mods.RA/Minelayer.cs | 2 +- OpenRA.Mods.RA/Passenger.cs | 2 +- OpenRA.Mods.RA/Plane.cs | 2 +- OpenRA.Mods.RA/PrimaryBuilding.cs | 2 +- OpenRA.Mods.RA/RallyPoint.cs | 2 +- OpenRA.Mods.RA/Render/RenderSpy.cs | 2 +- OpenRA.Mods.RA/Repairable.cs | 2 +- OpenRA.Mods.RA/RepairableNear.cs | 2 +- OpenRA.Mods.RA/Spy.cs | 2 +- OpenRA.Mods.RA/Transforms.cs | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs index fb26423761..600b0b3f03 100644 --- a/OpenRA.Game/Orders/UnitOrderGenerator.cs +++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs @@ -103,7 +103,7 @@ namespace OpenRA.Orders if( mi.Button == MouseButton.Right ) { var uim = self.World.WorldActor.Trait(); - foreach( var o in self.TraitsImplementing() + foreach( var o in self.TraitsImplementing() .SelectMany( trait => trait.Orders .Select( x => new { Trait = trait, Order = x } ) ) .OrderByDescending( x => x.Order.OrderPriority ) ) @@ -135,11 +135,11 @@ namespace OpenRA.Orders { public readonly Actor self; public readonly IOrderTargeter iot; - public readonly IIssueOrder2 trait; + public readonly IIssueOrder trait; public readonly string cursor; public readonly Target target; - public UnitOrderResult( Actor self, IOrderTargeter iot, IIssueOrder2 trait, string cursor, Target target ) + public UnitOrderResult( Actor self, IOrderTargeter iot, IIssueOrder trait, string cursor, Target target ) { this.self = self; this.iot = iot; diff --git a/OpenRA.Game/Traits/Mobile.cs b/OpenRA.Game/Traits/Mobile.cs index 637467a083..b90a08ce7b 100644 --- a/OpenRA.Game/Traits/Mobile.cs +++ b/OpenRA.Game/Traits/Mobile.cs @@ -54,7 +54,7 @@ namespace OpenRA.Traits } } - public class Mobile : IIssueOrder2, IResolveOrder, IOrderVoice, IOccupySpace, IMove, IFacing, INudge + public class Mobile : IIssueOrder, IResolveOrder, IOrderVoice, IOccupySpace, IMove, IFacing, INudge { public readonly Actor self; public readonly MobileInfo Info; diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index ee84319a0f..4160141177 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -33,7 +33,7 @@ namespace OpenRA.Traits public interface ITick { void Tick(Actor self); } public interface IRender { IEnumerable Render(Actor self); } - public interface IIssueOrder2 + public interface IIssueOrder { IEnumerable Orders { get; } Order IssueOrder( Actor self, IOrderTargeter order, Target target ); diff --git a/OpenRA.Mods.RA/AttackBase.cs b/OpenRA.Mods.RA/AttackBase.cs index a86679eb9a..c7d7396c20 100644 --- a/OpenRA.Mods.RA/AttackBase.cs +++ b/OpenRA.Mods.RA/AttackBase.cs @@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA public virtual object Create(ActorInitializer init) { return new AttackBase(init.self); } } - public class AttackBase : IIssueOrder2, IResolveOrder, ITick, IExplodeModifier, IOrderVoice + public class AttackBase : IIssueOrder, IResolveOrder, ITick, IExplodeModifier, IOrderVoice { public bool IsAttacking { get; internal set; } public Target target; diff --git a/OpenRA.Mods.RA/C4Demolition.cs b/OpenRA.Mods.RA/C4Demolition.cs index c1e1a03ef1..dc49fb6652 100644 --- a/OpenRA.Mods.RA/C4Demolition.cs +++ b/OpenRA.Mods.RA/C4Demolition.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA public readonly float C4Delay = 0; } - class C4Demolition : IIssueOrder2, IResolveOrder, IOrderVoice + class C4Demolition : IIssueOrder, IResolveOrder, IOrderVoice { public IEnumerable Orders { diff --git a/OpenRA.Mods.RA/Cargo.cs b/OpenRA.Mods.RA/Cargo.cs index cb980d5b19..b5b88a7cd5 100644 --- a/OpenRA.Mods.RA/Cargo.cs +++ b/OpenRA.Mods.RA/Cargo.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA public object Create( ActorInitializer init ) { return new Cargo( init.self ); } } - public class Cargo : IPips, IIssueOrder2, IResolveOrder, IOrderVoice, INotifyDamage + public class Cargo : IPips, IIssueOrder, IResolveOrder, IOrderVoice, INotifyDamage { readonly Actor self; List cargo = new List(); diff --git a/OpenRA.Mods.RA/ChronoshiftDeploy.cs b/OpenRA.Mods.RA/ChronoshiftDeploy.cs index 665bb74ca8..ab243dcfff 100644 --- a/OpenRA.Mods.RA/ChronoshiftDeploy.cs +++ b/OpenRA.Mods.RA/ChronoshiftDeploy.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA public readonly int ChargeTime = 120; // Seconds } - class ChronoshiftDeploy : IIssueOrder2, IResolveOrder, ITick, IPips, IOrderVoice + class ChronoshiftDeploy : IIssueOrder, IResolveOrder, ITick, IPips, IOrderVoice { // Recharge logic [Sync] diff --git a/OpenRA.Mods.RA/EngineerCapture.cs b/OpenRA.Mods.RA/EngineerCapture.cs index 46fafb44a5..850778d4c7 100644 --- a/OpenRA.Mods.RA/EngineerCapture.cs +++ b/OpenRA.Mods.RA/EngineerCapture.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; namespace OpenRA.Mods.RA { class EngineerCaptureInfo : TraitInfo {} - class EngineerCapture : IIssueOrder2, IResolveOrder, IOrderVoice + class EngineerCapture : IIssueOrder, IResolveOrder, IOrderVoice { public IEnumerable Orders { diff --git a/OpenRA.Mods.RA/EngineerRepair.cs b/OpenRA.Mods.RA/EngineerRepair.cs index 8d2a65d7be..11c641af93 100644 --- a/OpenRA.Mods.RA/EngineerRepair.cs +++ b/OpenRA.Mods.RA/EngineerRepair.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA { class EngineerRepairInfo : TraitInfo {} - class EngineerRepair : IIssueOrder2, IResolveOrder, IOrderVoice + class EngineerRepair : IIssueOrder, IResolveOrder, IOrderVoice { public IEnumerable Orders { diff --git a/OpenRA.Mods.RA/Harvester.cs b/OpenRA.Mods.RA/Harvester.cs index f7bc8c5a4b..e4d58519cd 100644 --- a/OpenRA.Mods.RA/Harvester.cs +++ b/OpenRA.Mods.RA/Harvester.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA public object Create(ActorInitializer init) { return new Harvester(init.self, this); } } - public class Harvester : IIssueOrder2, IResolveOrder, INotifyDamage, IPips, + public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips, IRenderModifier, IExplodeModifier, IOrderVoice, ISpeedModifier { diff --git a/OpenRA.Mods.RA/Helicopter.cs b/OpenRA.Mods.RA/Helicopter.cs index 539569c8e3..a3019371b1 100644 --- a/OpenRA.Mods.RA/Helicopter.cs +++ b/OpenRA.Mods.RA/Helicopter.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA public override object Create( ActorInitializer init ) { return new Helicopter( init, this); } } - class Helicopter : Aircraft, ITick, IIssueOrder2, IResolveOrder, IOrderVoice + class Helicopter : Aircraft, ITick, IIssueOrder, IResolveOrder, IOrderVoice { public IDisposable reservation; HelicopterInfo Info; diff --git a/OpenRA.Mods.RA/Minelayer.cs b/OpenRA.Mods.RA/Minelayer.cs index 5a2a1c164b..818e8a9a28 100644 --- a/OpenRA.Mods.RA/Minelayer.cs +++ b/OpenRA.Mods.RA/Minelayer.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA public readonly string[] RearmBuildings = { "fix" }; } - class Minelayer : IIssueOrder2, IResolveOrder, IPostRenderSelection + class Minelayer : IIssueOrder, IResolveOrder, IPostRenderSelection { /* [Sync] when sync can cope with arrays! */ public int2[] minefield = null; diff --git a/OpenRA.Mods.RA/Passenger.cs b/OpenRA.Mods.RA/Passenger.cs index 3ecef19257..4e9160587b 100644 --- a/OpenRA.Mods.RA/Passenger.cs +++ b/OpenRA.Mods.RA/Passenger.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA public object Create( ActorInitializer init ) { return new Passenger( init.self ); } } - class Passenger : IIssueOrder2, IResolveOrder, IOrderVoice + class Passenger : IIssueOrder, IResolveOrder, IOrderVoice { readonly Actor self; public Passenger( Actor self ) { this.self = self; } diff --git a/OpenRA.Mods.RA/Plane.cs b/OpenRA.Mods.RA/Plane.cs index 37991e3456..f704484c0d 100644 --- a/OpenRA.Mods.RA/Plane.cs +++ b/OpenRA.Mods.RA/Plane.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA public override object Create( ActorInitializer init ) { return new Plane( init, this ); } } - public class Plane : Aircraft, IIssueOrder2, IResolveOrder, IOrderVoice, ITick + public class Plane : Aircraft, IIssueOrder, IResolveOrder, IOrderVoice, ITick { public IDisposable reservation; diff --git a/OpenRA.Mods.RA/PrimaryBuilding.cs b/OpenRA.Mods.RA/PrimaryBuilding.cs index ff33775ae8..583d8fccb6 100755 --- a/OpenRA.Mods.RA/PrimaryBuilding.cs +++ b/OpenRA.Mods.RA/PrimaryBuilding.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA { class PrimaryBuildingInfo : TraitInfo { } - class PrimaryBuilding : IIssueOrder2, IResolveOrder, ITags + class PrimaryBuilding : IIssueOrder, IResolveOrder, ITags { bool isPrimary = false; public bool IsPrimary { get { return isPrimary; } } diff --git a/OpenRA.Mods.RA/RallyPoint.cs b/OpenRA.Mods.RA/RallyPoint.cs index 329835daa0..7379758fef 100755 --- a/OpenRA.Mods.RA/RallyPoint.cs +++ b/OpenRA.Mods.RA/RallyPoint.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA public object Create(ActorInitializer init) { return new RallyPoint(init.self); } } - public class RallyPoint : IRender, IIssueOrder2, IResolveOrder, ITick + public class RallyPoint : IRender, IIssueOrder, IResolveOrder, ITick { [Sync] public int2 rallyPoint; diff --git a/OpenRA.Mods.RA/Render/RenderSpy.cs b/OpenRA.Mods.RA/Render/RenderSpy.cs index 987ee46293..2a8ee92ab9 100755 --- a/OpenRA.Mods.RA/Render/RenderSpy.cs +++ b/OpenRA.Mods.RA/Render/RenderSpy.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Render public override object Create(ActorInitializer init) { return new RenderSpy(init.self); } } - class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder2, IResolveOrder, IOrderVoice + class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder, IResolveOrder, IOrderVoice { Player disguisedAsPlayer; string disguisedAsSprite; diff --git a/OpenRA.Mods.RA/Repairable.cs b/OpenRA.Mods.RA/Repairable.cs index ad45b9d98d..57c1e1029b 100644 --- a/OpenRA.Mods.RA/Repairable.cs +++ b/OpenRA.Mods.RA/Repairable.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA public virtual object Create(ActorInitializer init) { return new Repairable(init.self); } } - class Repairable : IIssueOrder2, IResolveOrder, IOrderVoice + class Repairable : IIssueOrder, IResolveOrder, IOrderVoice { readonly Actor self; readonly Health Health; diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs index c0e3240795..aa167ee703 100644 --- a/OpenRA.Mods.RA/RepairableNear.cs +++ b/OpenRA.Mods.RA/RepairableNear.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA public object Create( ActorInitializer init ) { return new RepairableNear( init.self ); } } - class RepairableNear : IIssueOrder2, IResolveOrder + class RepairableNear : IIssueOrder, IResolveOrder { readonly Actor self; diff --git a/OpenRA.Mods.RA/Spy.cs b/OpenRA.Mods.RA/Spy.cs index c5ed1fb6af..8460914d21 100644 --- a/OpenRA.Mods.RA/Spy.cs +++ b/OpenRA.Mods.RA/Spy.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA { class SpyInfo : TraitInfo { } - class Spy : IIssueOrder2, IResolveOrder + class Spy : IIssueOrder, IResolveOrder { public IEnumerable Orders { diff --git a/OpenRA.Mods.RA/Transforms.cs b/OpenRA.Mods.RA/Transforms.cs index 6e46dade23..40c37cec90 100644 --- a/OpenRA.Mods.RA/Transforms.cs +++ b/OpenRA.Mods.RA/Transforms.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA public virtual object Create(ActorInitializer init) { return new Transforms(init.self, this); } } - class Transforms : IIssueOrder2, IResolveOrder, IOrderVoice + class Transforms : IIssueOrder, IResolveOrder, IOrderVoice { Actor self; TransformsInfo Info;