From d4b08850f3b077be9e1755252e1da67467f43fe7 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Wed, 22 Jan 2020 15:30:38 +0300 Subject: [PATCH] Fix conditionality of DisguiseTooltipInfo. --- OpenRA.Mods.Cnc/Traits/Disguise.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Disguise.cs b/OpenRA.Mods.Cnc/Traits/Disguise.cs index 939b00d174..34eabacee1 100644 --- a/OpenRA.Mods.Cnc/Traits/Disguise.cs +++ b/OpenRA.Mods.Cnc/Traits/Disguise.cs @@ -25,16 +25,15 @@ namespace OpenRA.Mods.Cnc.Traits public override object Create(ActorInitializer init) { return new DisguiseTooltip(init.Self, this); } } - class DisguiseTooltip : ITooltip + class DisguiseTooltip : ConditionalTrait, 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(); } @@ -42,7 +41,7 @@ namespace OpenRA.Mods.Cnc.Traits { get { - return disguise.Disguised ? disguise.AsTooltipInfo : info; + return disguise.Disguised ? disguise.AsTooltipInfo : Info; } }