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

Move Facing and Altitude onto IMove impls, with associated pile of cleanups

Browse Source
This commit is contained in:
Paul Chote
2010-07-31 22:59:43 +12:00
parent 88cb942430
commit 207ee49da3
51 changed files with 186 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,12 +10,12 @@
namespace OpenRA.Traits
{
class TurretedInfo : ITraitInfo
public class TurretedInfo : ITraitInfo
{
public readonly int ROT = 255;
public readonly int InitialFacing = 128;
public object Create(ActorInitializer init) { return new Turreted(init.self); }
public object Create(ActorInitializer init) { return new Turreted(init.self, this); }
}
public class Turreted : ITick
@@ -23,16 +23,20 @@ namespace OpenRA.Traits
[Sync]
public int turretFacing = 0;
public int? desiredFacing;
public Turreted(Actor self)
TurretedInfo Info;
IMove Move;
public Turreted(Actor self, TurretedInfo info)
{
turretFacing = self.Info.Traits.Get<TurretedInfo>().InitialFacing;
Info = info;
turretFacing = info.InitialFacing;
Move = self.traits.GetOrDefault<IMove>();
}
public void Tick( Actor self )
{
var df = desiredFacing ?? ( self.traits.Contains<Unit>() ? self.traits.Get<Unit>().Facing : turretFacing );
Util.TickFacing(ref turretFacing, df, self.Info.Traits.Get<TurretedInfo>().ROT);
var df = desiredFacing ?? ( Move != null ? Move.Facing : turretFacing );
turretFacing = Util.TickFacing(turretFacing, df, Info.ROT);
}
}
}