From 9b1d74951ab0ce12e06a2653253387f98904bad3 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 5 Dec 2009 16:49:12 +1300
Subject: [PATCH] v2 'aim' anims

---
 OpenRa.Game/Traits/RenderUnitReload.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OpenRa.Game/Traits/RenderUnitReload.cs b/OpenRa.Game/Traits/RenderUnitReload.cs
index e09f6381f1..59f05a5ea7 100644
--- a/OpenRa.Game/Traits/RenderUnitReload.cs
+++ b/OpenRa.Game/Traits/RenderUnitReload.cs
@@ -9,10 +9,14 @@ namespace OpenRa.Game.Traits
 
 		public override void Tick(Actor self)
 		{
-			base.Tick(self);
+			var isAttacking = self.GetCurrentActivity() is Activities.Attack;
+
 			var attack = self.traits.WithInterface<AttackBase>().FirstOrDefault();
+
 			if (attack != null)
-				anim.ReplaceAnim(attack.IsReloading() ? "empty-idle" : "idle");
+				anim.ReplaceAnim((attack.IsReloading() ? "empty-" : "")
+					+ (isAttacking ? "aim" : "idle"));
+			base.Tick(self);
 		}
 	}
 }