rename IIssueOrder2 -> IIssueOrder

This commit is contained in:
Bob
2010-10-03 07:08:02 +13:00
committed by Paul Chote
parent d3244184c1
commit aebef4f1c8
21 changed files with 23 additions and 23 deletions

View File

@@ -103,7 +103,7 @@ namespace OpenRA.Orders
if( mi.Button == MouseButton.Right ) if( mi.Button == MouseButton.Right )
{ {
var uim = self.World.WorldActor.Trait<UnitInfluence>(); var uim = self.World.WorldActor.Trait<UnitInfluence>();
foreach( var o in self.TraitsImplementing<IIssueOrder2>() foreach( var o in self.TraitsImplementing<IIssueOrder>()
.SelectMany( trait => trait.Orders .SelectMany( trait => trait.Orders
.Select( x => new { Trait = trait, Order = x } ) ) .Select( x => new { Trait = trait, Order = x } ) )
.OrderByDescending( x => x.Order.OrderPriority ) ) .OrderByDescending( x => x.Order.OrderPriority ) )
@@ -135,11 +135,11 @@ namespace OpenRA.Orders
{ {
public readonly Actor self; public readonly Actor self;
public readonly IOrderTargeter iot; public readonly IOrderTargeter iot;
public readonly IIssueOrder2 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 iot, IIssueOrder2 trait, string cursor, Target target ) public UnitOrderResult( Actor self, IOrderTargeter iot, IIssueOrder trait, string cursor, Target target )
{ {
this.self = self; this.self = self;
this.iot = iot; this.iot = iot;

View File

@@ -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 Actor self;
public readonly MobileInfo Info; public readonly MobileInfo Info;

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Traits
public interface ITick { void Tick(Actor self); } public interface ITick { void Tick(Actor self); }
public interface IRender { IEnumerable<Renderable> Render(Actor self); } public interface IRender { IEnumerable<Renderable> Render(Actor self); }
public interface IIssueOrder2 public interface IIssueOrder
{ {
IEnumerable<IOrderTargeter> Orders { get; } IEnumerable<IOrderTargeter> Orders { get; }
Order IssueOrder( Actor self, IOrderTargeter order, Target target ); Order IssueOrder( Actor self, IOrderTargeter order, Target target );

View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new AttackBase(init.self); } 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 bool IsAttacking { get; internal set; }
public Target target; public Target target;

View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA
public readonly float C4Delay = 0; public readonly float C4Delay = 0;
} }
class C4Demolition : IIssueOrder2, IResolveOrder, IOrderVoice class C4Demolition : IIssueOrder, IResolveOrder, IOrderVoice
{ {
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA
public object Create( ActorInitializer init ) { return new Cargo( init.self ); } 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; readonly Actor self;
List<Actor> cargo = new List<Actor>(); List<Actor> cargo = new List<Actor>();

View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA
public readonly int ChargeTime = 120; // Seconds public readonly int ChargeTime = 120; // Seconds
} }
class ChronoshiftDeploy : IIssueOrder2, IResolveOrder, ITick, IPips, IOrderVoice class ChronoshiftDeploy : IIssueOrder, IResolveOrder, ITick, IPips, IOrderVoice
{ {
// Recharge logic // Recharge logic
[Sync] [Sync]

View File

@@ -19,7 +19,7 @@ using System.Collections.Generic;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
class EngineerCaptureInfo : TraitInfo<EngineerCapture> {} class EngineerCaptureInfo : TraitInfo<EngineerCapture> {}
class EngineerCapture : IIssueOrder2, IResolveOrder, IOrderVoice class EngineerCapture : IIssueOrder, IResolveOrder, IOrderVoice
{ {
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {

View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA
{ {
class EngineerRepairInfo : TraitInfo<EngineerRepair> {} class EngineerRepairInfo : TraitInfo<EngineerRepair> {}
class EngineerRepair : IIssueOrder2, IResolveOrder, IOrderVoice class EngineerRepair : IIssueOrder, IResolveOrder, IOrderVoice
{ {
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {

View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new Harvester(init.self, this); } 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, IRenderModifier, IExplodeModifier, IOrderVoice,
ISpeedModifier ISpeedModifier
{ {

View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA
public override object Create( ActorInitializer init ) { return new Helicopter( init, this); } 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; public IDisposable reservation;
HelicopterInfo Info; HelicopterInfo Info;

View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA
public readonly string[] RearmBuildings = { "fix" }; public readonly string[] RearmBuildings = { "fix" };
} }
class Minelayer : IIssueOrder2, IResolveOrder, IPostRenderSelection class Minelayer : IIssueOrder, IResolveOrder, IPostRenderSelection
{ {
/* [Sync] when sync can cope with arrays! */ /* [Sync] when sync can cope with arrays! */
public int2[] minefield = null; public int2[] minefield = null;

View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
public object Create( ActorInitializer init ) { return new Passenger( init.self ); } public object Create( ActorInitializer init ) { return new Passenger( init.self ); }
} }
class Passenger : IIssueOrder2, IResolveOrder, IOrderVoice class Passenger : IIssueOrder, IResolveOrder, IOrderVoice
{ {
readonly Actor self; readonly Actor self;
public Passenger( Actor self ) { this.self = self; } public Passenger( Actor self ) { this.self = self; }

View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA
public override object Create( ActorInitializer init ) { return new Plane( init, this ); } 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; public IDisposable reservation;

View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA
{ {
class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { } class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { }
class PrimaryBuilding : IIssueOrder2, IResolveOrder, ITags class PrimaryBuilding : IIssueOrder, IResolveOrder, ITags
{ {
bool isPrimary = false; bool isPrimary = false;
public bool IsPrimary { get { return isPrimary; } } public bool IsPrimary { get { return isPrimary; } }

View File

@@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA
public object Create(ActorInitializer init) { return new RallyPoint(init.self); } 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] [Sync]
public int2 rallyPoint; public int2 rallyPoint;

View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.RA.Render
public override object Create(ActorInitializer init) { return new RenderSpy(init.self); } 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; Player disguisedAsPlayer;
string disguisedAsSprite; string disguisedAsSprite;

View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new Repairable(init.self); } 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 Actor self;
readonly Health Health; readonly Health Health;

View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.RA
public object Create( ActorInitializer init ) { return new RepairableNear( init.self ); } public object Create( ActorInitializer init ) { return new RepairableNear( init.self ); }
} }
class RepairableNear : IIssueOrder2, IResolveOrder class RepairableNear : IIssueOrder, IResolveOrder
{ {
readonly Actor self; readonly Actor self;

View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA
{ {
class SpyInfo : TraitInfo<Spy> { } class SpyInfo : TraitInfo<Spy> { }
class Spy : IIssueOrder2, IResolveOrder class Spy : IIssueOrder, IResolveOrder
{ {
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {

View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new Transforms(init.self, this); } public virtual object Create(ActorInitializer init) { return new Transforms(init.self, this); }
} }
class Transforms : IIssueOrder2, IResolveOrder, IOrderVoice class Transforms : IIssueOrder, IResolveOrder, IOrderVoice
{ {
Actor self; Actor self;
TransformsInfo Info; TransformsInfo Info;