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

fix #1056

Browse Source
This commit is contained in:
Chris Forbes
2011-07-19 18:56:12 +12:00
parent 7429c8ef89
commit 833533b4c3
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -34,6 +34,13 @@ namespace OpenRA.Traits
{ {
public Dictionary<string, AnimationWithOffset> anims = new Dictionary<string, AnimationWithOffset>(); public Dictionary<string, AnimationWithOffset> anims = new Dictionary<string, AnimationWithOffset>();
public static Func<int> MakeFacingFunc(Actor self)
{
var facing = self.TraitOrDefault<IFacing>();
if (facing == null) return () => 0;
return () => facing.Facing;
}
public Animation anim public Animation anim
{ {
get { return anims[""].Animation; } get { return anims[""].Animation; }

5
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -41,6 +41,7 @@ namespace OpenRA.Mods.RA.Render
RenderInfantryInfo Info; RenderInfantryInfo Info;
string idleSequence; string idleSequence;
int idleDelay; int idleDelay;
Mobile mobile;
protected virtual string NormalizeInfantrySequence(Actor self, string baseSequence) protected virtual string NormalizeInfantrySequence(Actor self, string baseSequence)
{ {
@@ -53,9 +54,9 @@ namespace OpenRA.Mods.RA.Render
} }
public AnimationState State { get; private set; } public AnimationState State { get; private set; }
Mobile mobile;
public RenderInfantry(Actor self, RenderInfantryInfo info) public RenderInfantry(Actor self, RenderInfantryInfo info)
: base(self, () => self.Trait<IFacing>().Facing) : base(self, RenderSimple.MakeFacingFunc(self))
{ {
Info = info; Info = info;
anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0); anim.PlayFetchIndex(NormalizeInfantrySequence(self, "stand"), () => 0);

9
OpenRA.Mods.RA/Render/RenderUnit.cs
View File

@@ -21,15 +21,8 @@ namespace OpenRA.Mods.RA.Render
public class RenderUnit : RenderSimple public class RenderUnit : RenderSimple
{ {
static Func<int> MakeFacingFunc(Actor self)
{
var facing = self.TraitOrDefault<IFacing>();
if (facing == null) return () => 0;
return () => facing.Facing;
}
public RenderUnit(Actor self) public RenderUnit(Actor self)
: base(self, MakeFacingFunc(self)) : base(self, RenderSimple.MakeFacingFunc(self))
{ {
anim.PlayRepeating("idle"); anim.PlayRepeating("idle");
} }