- emergency siren and alarm buzzer items

- wires and alarm buzzers can be fabricated
- fixed items selecting constructions outside the hulls
- ItemLabel.TextColor works now
- removed a random dot at the corner of head5.png
- inventory is visible in wiring mode
- fixed null reference exceptions in AIObjectiveGoto and Holdable
This commit is contained in:
Regalis
2016-03-17 19:28:46 +02:00
parent 20d61b0647
commit 8df9864db9
13 changed files with 143 additions and 40 deletions
@@ -26,17 +26,18 @@ namespace Barotrauma.Items.Components
set
{
textColor = new Color(ToolBox.ParseToVector4(value));
if (textBlock != null) textBlock.TextColor = textColor;
}
}
private GUITextBlock TextBlock
{
get
{
if (textBlock==null)
if (textBlock == null)
{
textBlock = new GUITextBlock(new Rectangle(item.Rect.X,-item.Rect.Y,item.Rect.Width, item.Rect.Height), "",
Color.Transparent, Color.Black,
Color.Transparent, textColor,
Alignment.TopLeft, Alignment.Center,
null, null, true);
textBlock.Font = GUI.SmallFont;
@@ -46,7 +47,7 @@ namespace Barotrauma.Items.Components
return textBlock;
}
}
public override void Move(Vector2 amount)
{
textBlock.Rect = new Rectangle(item.Rect.X, -item.Rect.Y, item.Rect.Width, item.Rect.Height);