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

Make RenderSprites aware of EffectiveOwner. Fixes #5526.

Browse Source
This commit is contained in:
Paul Chote
2014-06-02 18:21:06 +12:00
parent ca9148c2d5
commit c0d7c7d840
4 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/Render/RenderDisguise.cs
View File

@@ -8,9 +8,11 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
{
class RenderDisguiseInfo : RenderInfantryProneInfo
class RenderDisguiseInfo : RenderInfantryProneInfo, Requires<DisguiseInfo>
{
public override object Create(ActorInitializer init) { return new RenderDisguise(init.self, this); }
}
@@ -29,12 +31,6 @@ namespace OpenRA.Mods.RA.Render
intendedSprite = disguise.AsSprite;
}
protected override string PaletteName(Actor self)
{
var player = disguise.AsPlayer ?? self.Owner;
return info.Palette ?? info.PlayerPalette + player.InternalName;
}
public override void Tick(Actor self)
{
if (disguise.AsSprite != intendedSprite)