epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11984 from reaperrr/upgradable-tooltip

Browse Source 
Make Tooltip upgradable
This commit is contained in:
Oliver Brakmann
2016-10-26 20:48:19 +02:00
committed by GitHub
parent a6cde32a00 efa6ad64f7
commit 443d35f240
10 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
public ITooltipInfo TooltipInfo { get; private set; }
public Player TooltipOwner { get; private set; }
readonly ITooltip tooltip;
readonly ITooltip[] tooltips;
public int HP { get; private set; }
public DamageState DamageState { get; private set; }
@@ -80,7 +80,7 @@ namespace OpenRA.Traits
Bounds = self.Bounds;
TargetTypes = self.GetEnabledTargetTypes().ToHashSet();
tooltip = self.TraitsImplementing<ITooltip>().FirstOrDefault();
tooltips = self.TraitsImplementing<ITooltip>().ToArray();
health = self.TraitOrDefault<IHealth>();
UpdateVisibility();
@@ -101,6 +101,7 @@ namespace OpenRA.Traits
DamageState = health.DamageState;
}
var tooltip = tooltips.FirstOrDefault(Exts.IsTraitEnabled);
if (tooltip != null)
{
TooltipInfo = tooltip.TooltipInfo;