Fix conditionality of DisguiseTooltipInfo.

OpenRA · Jan 25, 2020 · d4b0885 · d4b0885
1 parent 1fada0f
commit d4b0885
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/OpenRA.Mods.Cnc/Traits/Disguise.cs b/OpenRA.Mods.Cnc/Traits/Disguise.cs
@@ -25,24 +25,23 @@ class DisguiseTooltipInfo : TooltipInfo, Requires<DisguiseInfo>
 		public override object Create(ActorInitializer init) { return new DisguiseTooltip(init.Self, this); }
 	}
 
-	class DisguiseTooltip : ITooltip
+	class DisguiseTooltip : ConditionalTrait<DisguiseTooltipInfo>, ITooltip
 	{
 		readonly Actor self;
 		readonly Disguise disguise;
-		TooltipInfo info;
 
-		public DisguiseTooltip(Actor self, TooltipInfo info)
+		public DisguiseTooltip(Actor self, DisguiseTooltipInfo info)
+			: base(info)
 		{
 			this.self = self;
-			this.info = info;
 			disguise = self.Trait<Disguise>();
 		}
 
 		public ITooltipInfo TooltipInfo
 		{
 			get
 			{
-				return disguise.Disguised ? disguise.AsTooltipInfo : info;
+				return disguise.Disguised ? disguise.AsTooltipInfo : Info;
 			}
 		}