From 3aa7ff5a6b4e7d190e42e54236736d4798678cc2 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sun, 15 Aug 2010 20:27:15 +1200 Subject: [PATCH] fix various bugs in prev 2 --- OpenRA.Mods.RA/Render/RenderSpy.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.RA/Render/RenderSpy.cs b/OpenRA.Mods.RA/Render/RenderSpy.cs index 154a902255..5489ea35fa 100755 --- a/OpenRA.Mods.RA/Render/RenderSpy.cs +++ b/OpenRA.Mods.RA/Render/RenderSpy.cs @@ -19,7 +19,7 @@ namespace OpenRA.Mods.RA.Render public override object Create(ActorInitializer init) { return new RenderSpy(init.self); } } - class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder, IResolveOrder, IOrderCursor + class RenderSpy : RenderInfantry, IRenderModifier, IIssueOrder, IResolveOrder, IOrderCursor, IOrderVoice { Actor disguisedAs; @@ -33,9 +33,9 @@ namespace OpenRA.Mods.RA.Render public override void Tick(Actor self) { if (disguisedAs != null) - anim.ChangeImage(self.Owner == self.World.LocalPlayer - ? GetImage(self) - : disguisedAs.Trait().GetImage(disguisedAs)); + anim.ChangeImage(disguisedAs.Trait().GetImage(disguisedAs)); + else + anim.ChangeImage(GetImage(self)); base.Tick(self); } @@ -58,5 +58,10 @@ namespace OpenRA.Mods.RA.Render { return order.OrderString == "Disguise" ? "deploy" : null; } + + public string VoicePhraseForOrder(Actor self, Order order) + { + return order.OrderString == "Disguise" ? "Attack" : null; + } } }