v2 'aim' anims

2009-12-05 16:49:12 +13:00
parent 0863ca5df2
commit 9b1d74951a
1 changed files with 6 additions and 2 deletions
--- 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);
 		}
 	}
 }