diff --git a/OpenRA.Mods.RA/Attack/AttackBase.cs b/OpenRA.Mods.RA/Attack/AttackBase.cs index fedba8af2c..9c8f80ec25 100644 --- a/OpenRA.Mods.RA/Attack/AttackBase.cs +++ b/OpenRA.Mods.RA/Attack/AttackBase.cs @@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA Lazy> armaments; protected IEnumerable Armaments { get { return armaments.Value; } } - public AttackBase(Actor self) + public AttackBase(Actor self, AttackBaseInfo info) { this.self = self; armaments = Lazy.New(() => self.TraitsImplementing()); diff --git a/OpenRA.Mods.RA/Attack/AttackCharge.cs b/OpenRA.Mods.RA/Attack/AttackCharge.cs index de6a5c14b9..a566d89bc0 100644 --- a/OpenRA.Mods.RA/Attack/AttackCharge.cs +++ b/OpenRA.Mods.RA/Attack/AttackCharge.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.RA public readonly int InitialChargeDelay = 22; [Desc("Delay for additional charges if MaxCharge is larger than 1.")] public readonly int ChargeDelay = 3; - public override object Create(ActorInitializer init) { return new AttackCharge(init.self); } + public override object Create(ActorInitializer init) { return new AttackCharge(init.self, this); } } class AttackCharge : AttackOmni, ITick, INotifyAttack, ISync @@ -34,8 +34,8 @@ namespace OpenRA.Mods.RA [Sync] int charges; [Sync] int timeToRecharge; - public AttackCharge(Actor self) - : base(self) + public AttackCharge(Actor self, AttackChargeInfo info) + : base(self, info) { aci = self.Info.Traits.Get(); charges = aci.MaxCharges; diff --git a/OpenRA.Mods.RA/Attack/AttackFrontal.cs b/OpenRA.Mods.RA/Attack/AttackFrontal.cs index eb6d3848c5..3899ce30b1 100644 --- a/OpenRA.Mods.RA/Attack/AttackFrontal.cs +++ b/OpenRA.Mods.RA/Attack/AttackFrontal.cs @@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA readonly AttackFrontalInfo info; public AttackFrontal(Actor self, AttackFrontalInfo info) - : base(self) + : base(self, info) { this.info = info; } diff --git a/OpenRA.Mods.RA/Attack/AttackOmni.cs b/OpenRA.Mods.RA/Attack/AttackOmni.cs index bb56fe35e8..03ae111b4a 100644 --- a/OpenRA.Mods.RA/Attack/AttackOmni.cs +++ b/OpenRA.Mods.RA/Attack/AttackOmni.cs @@ -15,7 +15,7 @@ namespace OpenRA.Mods.RA { class AttackOmniInfo : AttackBaseInfo { - public override object Create(ActorInitializer init) { return new AttackOmni(init.self); } + public override object Create(ActorInitializer init) { return new AttackOmni(init.self, this); } } class AttackOmni : AttackBase, INotifyBuildComplete, ISync @@ -23,8 +23,8 @@ namespace OpenRA.Mods.RA [Sync] bool buildComplete = false; public void BuildingComplete(Actor self) { buildComplete = true; } - public AttackOmni(Actor self) - : base(self) { } + public AttackOmni(Actor self, AttackOmniInfo info) + : base(self, info) { } protected override bool CanAttack(Actor self, Target target) { diff --git a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs index aa832144ca..3cc3c05bb7 100644 --- a/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA Turreted turret; public AttackPopupTurreted(ActorInitializer init, AttackPopupTurretedInfo info) - : base(init.self) + : base(init.self, info) { this.info = info; buildComplete = init.Contains(); diff --git a/OpenRA.Mods.RA/Attack/AttackTurreted.cs b/OpenRA.Mods.RA/Attack/AttackTurreted.cs index 15ca6d32ed..052bc67486 100644 --- a/OpenRA.Mods.RA/Attack/AttackTurreted.cs +++ b/OpenRA.Mods.RA/Attack/AttackTurreted.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA { class AttackTurretedInfo : AttackBaseInfo, Requires { - public override object Create(ActorInitializer init) { return new AttackTurreted(init.self); } + public override object Create(ActorInitializer init) { return new AttackTurreted(init.self, this); } } class AttackTurreted : AttackBase, INotifyBuildComplete, ISync @@ -28,8 +28,8 @@ namespace OpenRA.Mods.RA protected IEnumerable turrets; [Sync] protected bool buildComplete; - public AttackTurreted(Actor self) - : base(self) + public AttackTurreted(Actor self, AttackTurretedInfo info) + : base(self, info) { turrets = self.TraitsImplementing(); } diff --git a/OpenRA.Mods.RA/AttackBomber.cs b/OpenRA.Mods.RA/AttackBomber.cs index fdc268ab0b..622b8840d0 100644 --- a/OpenRA.Mods.RA/AttackBomber.cs +++ b/OpenRA.Mods.RA/AttackBomber.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA [Sync] Target target; public AttackBomber(Actor self, AttackBomberInfo info) - : base(self) + : base(self, info) { this.info = info; this.camera = null;