Fix warnings about NREs in WithEmbeddedTurretSpriteBody
This commit is contained in:
@@ -33,8 +33,8 @@ namespace OpenRA.Mods.Cnc.Traits.Render
|
|||||||
if (!EnabledByDefault)
|
if (!EnabledByDefault)
|
||||||
yield break;
|
yield break;
|
||||||
|
|
||||||
var t = init.Actor.TraitInfos<TurretedInfo>().FirstOrDefault();
|
var t = init.Actor.TraitInfos<TurretedInfo>().First();
|
||||||
var wsb = init.Actor.TraitInfos<WithSpriteBodyInfo>().FirstOrDefault();
|
var wsb = init.Actor.TraitInfos<WithSpriteBodyInfo>().First();
|
||||||
|
|
||||||
// Show the correct turret facing
|
// Show the correct turret facing
|
||||||
var anim = new Animation(init.World, image, t.WorldFacingFromInit(init));
|
var anim = new Animation(init.World, image, t.WorldFacingFromInit(init));
|
||||||
@@ -52,15 +52,15 @@ namespace OpenRA.Mods.Cnc.Traits.Render
|
|||||||
static Func<WAngle> MakeTurretFacingFunc(Actor self)
|
static Func<WAngle> MakeTurretFacingFunc(Actor self)
|
||||||
{
|
{
|
||||||
// Turret artwork is baked into the sprite, so only the first turret makes sense.
|
// Turret artwork is baked into the sprite, so only the first turret makes sense.
|
||||||
var turreted = self.TraitsImplementing<Turreted>().FirstOrDefault();
|
var firstTurret = self.TraitsImplementing<Turreted>().First();
|
||||||
return () => turreted.WorldOrientation.Yaw;
|
return () => firstTurret.WorldOrientation.Yaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
public WithEmbeddedTurretSpriteBody(ActorInitializer init, WithEmbeddedTurretSpriteBodyInfo info)
|
public WithEmbeddedTurretSpriteBody(ActorInitializer init, WithEmbeddedTurretSpriteBodyInfo info)
|
||||||
: base(init, info, MakeTurretFacingFunc(init.Self))
|
: base(init, info, MakeTurretFacingFunc(init.Self))
|
||||||
{
|
{
|
||||||
this.info = info;
|
this.info = info;
|
||||||
turreted = init.Self.TraitsImplementing<Turreted>().FirstOrDefault();
|
turreted = init.Self.TraitsImplementing<Turreted>().First();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void TraitEnabled(Actor self)
|
protected override void TraitEnabled(Actor self)
|
||||||
|
|||||||
Reference in New Issue
Block a user