Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix DisguiseTooltip condtionality #17601

Merged
merged 1 commit into from Jan 25, 2020
Merged

Fix DisguiseTooltip condtionality #17601

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions OpenRA.Mods.Cnc/Traits/Disguise.cs
View file
Open in desktop
Expand Up @@ -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;
}
}

Expand Down