tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler warnings and remove dead code.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-05-28 00:30:34 +02:00
parent 996b45a04f
commit 9c3587b00e
12 changed files with 15 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -82,7 +82,7 @@ namespace Content.Client.GameObjects.Components.Actor
{
private readonly VBoxContainer _contentsVBox;
public CharacterWindow(IEnumerable<ICharacterUI> windowComponents) : base(IoCManager.Resolve<IDisplayManager>())
public CharacterWindow(IEnumerable<ICharacterUI> windowComponents)
{
Title = "Character";
HideOnClose = true;

3
Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -40,8 +40,7 @@ namespace Content.Client.GameObjects.Components.Construction
case PlayerAttachedMsg _:
if (Button == null)
{
Button = new ConstructionButton(IoCManager.Resolve<IDisplayManager>());
Button.Owner = this;
Button = new ConstructionButton {Owner = this};
}
Button.AddToScreen();
break;

4
Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Client.GameObjects.Components.Power
{
base.Open();
_window = new ApcWindow(IoCManager.Resolve<IDisplayManager>())
_window = new ApcWindow()
{
MarginRight = 426.0f, MarginBottom = 270.0f
};
@@ -124,7 +124,7 @@ namespace Content.Client.GameObjects.Components.Power
public Label ExternalPowerStateLabel { get; set; }
public ProgressBar ChargeBar { get; set; }
public ApcWindow(IDisplayManager displayMan) : base(displayMan)
public ApcWindow()
{
Title = "APC";
var rows = new VBoxContainer("Rows");

2
Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Client.GameObjects.Components.Power
{
LastWindow.Dispose();
}
LastWindow = new SS14Window(IoCManager.Resolve<IDisplayManager>())
LastWindow = new SS14Window()
{
Title = "Power Debug Tool",
};

7
Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs
View File

@@ -3,7 +3,6 @@ using Content.Client.Research;
using Content.Shared.GameObjects.Components.Research;
using Content.Shared.Research;
using Robust.Client.GameObjects.Components.UserInterface;
using Robust.Client.Interfaces.Graphics;
using Robust.Shared.GameObjects.Components.UserInterface;
using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
@@ -14,8 +13,6 @@ namespace Content.Client.GameObjects.Components.Research
public class LatheBoundUserInterface : BoundUserInterface
{
#pragma warning disable CS0649
[Dependency]
private IDisplayManager _displayManager;
[Dependency]
private IPrototypeManager _prototypeManager;
#pragma warning restore
@@ -50,8 +47,8 @@ namespace Content.Client.GameObjects.Components.Research
Lathe = lathe;
Database = database;
menu = new LatheMenu(_displayManager) {Owner = this};
queueMenu = new LatheQueueMenu(_displayManager) { Owner = this };
menu = new LatheMenu {Owner = this};
queueMenu = new LatheQueueMenu { Owner = this };
menu.OnClose += Close;

4
Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Client.GameObjects.Components.Storage
{
base.OnAdd();
Window = new StorageWindow(IoCManager.Resolve<IDisplayManager>())
Window = new StorageWindow()
{ StorageEntity = this};
}
@@ -109,7 +109,7 @@ namespace Content.Client.GameObjects.Components.Storage
private Label Information;
public ClientStorageComponent StorageEntity;
public StorageWindow(IDisplayManager displayMan) : base(displayMan)
public StorageWindow()
{
Size = new Vector2(180.0f, 320.0f);
}