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

Fix WithSpriteBody crashes

Browse Source
This commit is contained in:
abcdefg30
2019-05-29 09:11:54 +02:00
committed by Paul Chote
parent 7a403c9af5
commit 1c965d812f
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Cnc/Traits/Render/WithEmbeddedTurretSpriteBody.cs
View File

@@ -58,6 +58,11 @@ namespace OpenRA.Mods.Cnc.Traits.Render
: base(init, info, MakeTurretFacingFunc(init.Self)) : base(init, info, MakeTurretFacingFunc(init.Self))
{ {
turreted = init.Self.TraitsImplementing<Turreted>().FirstOrDefault(); turreted = init.Self.TraitsImplementing<Turreted>().FirstOrDefault();
}
protected override void TraitEnabled(Actor self)
{
base.TraitEnabled(self);
turreted.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings; turreted.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings;
} }

7
OpenRA.Mods.Cnc/Traits/Render/WithGunboatBody.cs
View File

@@ -62,13 +62,18 @@ namespace OpenRA.Mods.Cnc.Traits.Render
var name = rs.GetImage(init.Self); var name = rs.GetImage(init.Self);
turret = init.Self.TraitsImplementing<Turreted>() turret = init.Self.TraitsImplementing<Turreted>()
.First(t => t.Name == info.Turret); .First(t => t.Name == info.Turret);
turret.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings;
wake = new Animation(init.World, name); wake = new Animation(init.World, name);
wake.PlayRepeating(info.WakeLeftSequence); wake.PlayRepeating(info.WakeLeftSequence);
rs.Add(new AnimationWithOffset(wake, null, null, -87)); rs.Add(new AnimationWithOffset(wake, null, null, -87));
} }
protected override void TraitEnabled(Actor self)
{
base.TraitEnabled(self);
turret.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings;
}
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (facing.Facing <= 128) if (facing.Facing <= 128)

4
OpenRA.Mods.Common/Traits/Render/WithResourceLevelSpriteBody.cs
View File

@@ -47,7 +47,6 @@ namespace OpenRA.Mods.Common.Traits.Render
{ {
this.info = info; this.info = info;
playerResources = init.Self.Owner.PlayerActor.Trait<PlayerResources>(); playerResources = init.Self.Owner.PlayerActor.Trait<PlayerResources>();
ConfigureAnimation(init.Self);
} }
void ConfigureAnimation(Actor self) void ConfigureAnimation(Actor self)
@@ -65,7 +64,8 @@ namespace OpenRA.Mods.Common.Traits.Render
protected override void TraitEnabled(Actor self) protected override void TraitEnabled(Actor self)
{ {
// Do nothing - we just want to disable the default WithSpriteBody implementation base.TraitEnabled(self);
ConfigureAnimation(self);
} }
public override void CancelCustomAnimation(Actor self) public override void CancelCustomAnimation(Actor self)