Merge pull request #2770 from pchote/turret-cleanup

Weapon / Turret refactoring
2013-03-26 14:38:56 -07:00
parent 0ab57c9abc 0167bbfbaa
commit e795ab9174
81 changed files with 4023 additions and 820 deletions
--- a/OpenRA.Mods.Cnc/RenderGunboat.cs
+++ b/OpenRA.Mods.Cnc/RenderGunboat.cs
@@ -9,6 +9,7 @@
 #endregion

 using System;
+using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;

@@ -26,7 +27,7 @@ namespace OpenRA.Mods.RA.Render
 		string lastDamage = "";

 		public RenderGunboat(Actor self)
-			: base(self, () => self.HasTrait<Turreted>() ? self.Trait<Turreted>().turretFacing : 0)
+			: base(self, () => self.HasTrait<Turreted>() ? self.TraitsImplementing<Turreted>().First().turretFacing : 0)
 		{
 			facing = self.Trait<IFacing>();
 			anim.Play("left");