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

Split facing into its own interface; fix husks

Browse Source
This commit is contained in:
Paul Chote
2010-07-31 23:38:36 +12:00
parent 207ee49da3
commit d29e3f3f0e
29 changed files with 81 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Traits/Turreted.cs
View File

@@ -23,20 +23,20 @@ namespace OpenRA.Traits
[Sync]
public int turretFacing = 0;
public int? desiredFacing;
TurretedInfo Info;
IMove Move;
TurretedInfo info;
IFacing facing;
public Turreted(Actor self, TurretedInfo info)
{
Info = info;
this.info = info;
turretFacing = info.InitialFacing;
Move = self.traits.GetOrDefault<IMove>();
facing = self.traits.GetOrDefault<IFacing>();
}
public void Tick( Actor self )
{
var df = desiredFacing ?? ( Move != null ? Move.Facing : turretFacing );
turretFacing = Util.TickFacing(turretFacing, df, Info.ROT);
var df = desiredFacing ?? ( facing != null ? facing.Facing : turretFacing );
turretFacing = Util.TickFacing(turretFacing, df, info.ROT);
}
}
}