Merge pull request #3574 from ScottNZ/superweapons

Add atom bomb and gps public superweapon timers to RA
This commit is contained in:
Matthias Mailänder
2013-07-17 08:25:25 -07:00
10 changed files with 156 additions and 72 deletions

View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var baseHeight = widget.Bounds.Height;
var timeOffset = timeLabel.Bounds.X;
SupportPowerManager.SupportPowerInstance lastPower = null;
SupportPowerInstance lastPower = null;
tooltipContainer.BeforeRender = () =>
{
var sp = palette.TooltipPower;

View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Cnc.Widgets
public readonly string TooltipContainer;
public readonly string TooltipTemplate = "SUPPORT_POWER_TOOLTIP";
public SupportPowerManager.SupportPowerInstance TooltipPower { get; private set; }
public SupportPowerInstance TooltipPower { get; private set; }
Lazy<TooltipContainerWidget> tooltipContainer;
Rectangle eventBounds;
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Cnc.Widgets
public class SupportPowerIcon
{
public SupportPowerManager.SupportPowerInstance Power;
public SupportPowerInstance Power;
public float2 Pos;
public Sprite Sprite;
}