Merge pull request #6613 from pchote/remove-mp-tooltips

Remove the MP tooltip row from campaign missions.
This commit is contained in:
obrakmann
2014-10-04 12:20:14 +02:00
23 changed files with 559 additions and 69 deletions

View File

@@ -32,7 +32,7 @@ namespace OpenRA.Traits
public IRenderable[] Renderables { private get; set; }
public Player Owner;
public string TooltipName;
public ITooltipInfo TooltipInfo;
public Player TooltipOwner;
public int HP;

View File

@@ -26,6 +26,7 @@ namespace OpenRA.Traits
[Flags]
public enum Stance
{
None = 0,
Enemy = 1,
Neutral = 2,
Ally = 4,
@@ -126,10 +127,17 @@ namespace OpenRA.Traits
bool Disguised { get; }
Player Owner { get; }
}
public interface IToolTip
{
string Name();
Player Owner();
ITooltipInfo TooltipInfo { get; }
Player Owner { get; }
}
public interface ITooltipInfo
{
string TooltipForPlayerStance(Stance stance);
bool IsOwnerRowVisible { get; }
}
public interface IDisable { bool Disabled { get; } }

View File

@@ -114,7 +114,7 @@ namespace OpenRA.Widgets
}
var frozen = world.ScreenMap.FrozenActorsAt(world.RenderPlayer, worldRenderer.Viewport.ViewToWorldPx(Viewport.LastMousePos))
.Where(a => a.TooltipName != null && a.IsValid)
.Where(a => a.TooltipInfo != null && a.IsValid)
.WithHighestSelectionPriority();
if (frozen != null)