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

Make WithVoxelWalkerBody PausableConditional.

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2022-02-15 14:02:48 +03:00
committed by reaperrr
parent 6c33d47ef3
commit 91f626c42a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Cnc/Traits/Render/WithVoxelWalkerBody.cs
View File

@@ -20,7 +20,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits.Render
{
public class WithVoxelWalkerBodyInfo : TraitInfo, IRenderActorPreviewVoxelsInfo, Requires<RenderVoxelsInfo>, Requires<IMoveInfo>, Requires<IFacingInfo>
public class WithVoxelWalkerBodyInfo : PausableConditionalTraitInfo, IRenderActorPreviewVoxelsInfo, Requires<RenderVoxelsInfo>, Requires<IMoveInfo>, Requires<IFacingInfo>
{
public readonly string Sequence = "idle";
@@ -44,9 +44,8 @@ namespace OpenRA.Mods.Cnc.Traits.Render
}
}
public class WithVoxelWalkerBody : ITick, IActorPreviewInitModifier, IAutoMouseBounds
public class WithVoxelWalkerBody : PausableConditionalTrait<WithVoxelWalkerBodyInfo>, ITick, IActorPreviewInitModifier, IAutoMouseBounds
{
readonly WithVoxelWalkerBodyInfo info;
readonly IMove movement;
readonly ModelAnimation modelAnimation;
readonly RenderVoxels rv;
@@ -55,8 +54,8 @@ namespace OpenRA.Mods.Cnc.Traits.Render
readonly uint frames;
public WithVoxelWalkerBody(Actor self, WithVoxelWalkerBodyInfo info)
: base(info)
{
this.info = info;
movement = self.Trait<IMove>();
var body = self.Trait<BodyOrientation>();
@@ -66,18 +65,21 @@ namespace OpenRA.Mods.Cnc.Traits.Render
frames = model.Frames;
modelAnimation = new ModelAnimation(model, () => WVec.Zero,
() => body.QuantizeOrientation(self, self.Orientation),
() => false, () => frame, info.ShowShadow);
() => IsTraitDisabled, () => frame, info.ShowShadow);
rv.Add(modelAnimation);
}
void ITick.Tick(Actor self)
{
if (IsTraitDisabled || IsTraitPaused)
return;
if (movement.CurrentMovementTypes.HasMovementType(MovementType.Horizontal)
|| movement.CurrentMovementTypes.HasMovementType(MovementType.Turn))
tick++;
if (tick < info.TickRate)
if (tick < Info.TickRate)
return;
tick = 0;