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

Query Turreted trait dependencies using INotifyCreated. Fixes #6655.

Browse Source
This commit is contained in:
Paul Chote
2014-10-04 23:15:42 +13:00
parent 4c2eba6b04
commit f7c344bef8
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Turreted.cs
View File

@@ -29,14 +29,15 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new Turreted(init, this); } public virtual object Create(ActorInitializer init) { return new Turreted(init, this); }
} }
public class Turreted : ITick, ISync public class Turreted : ITick, ISync, INotifyCreated
{ {
readonly TurretedInfo info;
AttackTurreted attack;
IFacing facing;
[Sync] public int QuantizedFacings = 0; [Sync] public int QuantizedFacings = 0;
[Sync] public int turretFacing = 0; [Sync] public int turretFacing = 0;
public int? desiredFacing; public int? desiredFacing;
TurretedInfo info;
IFacing facing;
Lazy<AttackTurreted> attack;
int realignTick = 0; int realignTick = 0;
// For subclasses that want to move the turret relative to the body // For subclasses that want to move the turret relative to the body
@@ -60,13 +61,17 @@ namespace OpenRA.Mods.RA
{ {
this.info = info; this.info = info;
turretFacing = GetInitialTurretFacing(init, info.InitialFacing); turretFacing = GetInitialTurretFacing(init, info.InitialFacing);
facing = init.self.TraitOrDefault<IFacing>(); }
attack = Exts.Lazy(() => init.self.TraitOrDefault<AttackTurreted>());
public void Created(Actor self)
{
attack = self.TraitOrDefault<AttackTurreted>();
facing = self.TraitOrDefault<IFacing>();
} }
public virtual void Tick(Actor self) public virtual void Tick(Actor self)
{ {
if (attack.Value != null && !attack.Value.IsAttacking) if (attack != null && !attack.IsAttacking)
{ {
if (realignTick < info.RealignDelay) if (realignTick < info.RealignDelay)
realignTick++; realignTick++;