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

Fix various compiler warnings.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-02-21 22:01:13 +01:00
parent fd9db21ad7
commit 20846ef446
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/GameObjects/Components/Mobs/SpeciesUI.cs
View File

@@ -40,8 +40,10 @@ namespace Content.Client.GameObjects
private ScreenEffects _currentEffect = ScreenEffects.None; private ScreenEffects _currentEffect = ScreenEffects.None;
// Required dependencies // Required dependencies
#pragma warning disable 649
[Dependency] private readonly IOverlayManager _overlayManager; [Dependency] private readonly IOverlayManager _overlayManager;
[Dependency] private readonly IPlayerManager _playerManager; [Dependency] private readonly IPlayerManager _playerManager;
#pragma warning restore 649
//Relevant interface implementation for the character UI controller //Relevant interface implementation for the character UI controller
public Control Scene => _window; public Control Scene => _window;

2
Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
View File

@@ -11,8 +11,10 @@ namespace Content.Client.Graphics.Overlays
{ {
public class CircleMaskOverlay : Overlay public class CircleMaskOverlay : Overlay
{ {
#pragma warning disable 649
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IEyeManager _eyeManager;
#pragma warning restore 649
public override OverlaySpace Space => OverlaySpace.WorldSpace; public override OverlaySpace Space => OverlaySpace.WorldSpace;

3
Content.Client/Graphics/Overlays/GradientCircleMask.cs
View File

@@ -11,9 +11,10 @@ namespace Content.Client.Graphics.Overlays
{ {
public class GradientCircleMask : Overlay public class GradientCircleMask : Overlay
{ {
#pragma warning disable 649
[Dependency] private readonly IPrototypeManager _prototypeManager; [Dependency] private readonly IPrototypeManager _prototypeManager;
[Dependency] private readonly IEyeManager _eyeManager; [Dependency] private readonly IEyeManager _eyeManager;
#pragma warning restore 649
public override OverlaySpace Space => OverlaySpace.WorldSpace; public override OverlaySpace Space => OverlaySpace.WorldSpace;
public GradientCircleMask() : base(nameof(GradientCircleMask)) public GradientCircleMask() : base(nameof(GradientCircleMask))

1
Content.Client/Parallax/ParallaxManager.cs
View File

@@ -33,7 +33,6 @@ namespace Content.Client.Parallax
public async void LoadParallax() public async void LoadParallax()
{ {
MemoryStream configStream = null; MemoryStream configStream = null;
long crcValue;
string contents; string contents;
TomlTable table; TomlTable table;
try try

6
Content.Client/UserInterface/HandsGui.cs
View File

@@ -43,13 +43,13 @@ namespace Content.Client.UserInterface
{ {
base.Initialize(); base.Initialize();
var _resMgr = IoCManager.Resolve<IResourceCache>(); var resMgr = IoCManager.Resolve<IResourceCache>();
var handsBoxTexture = _resMgr.GetResource<TextureResource>("/Textures/UserInterface/handsbox.png"); var handsBoxTexture = resMgr.GetResource<TextureResource>("/Textures/UserInterface/handsbox.png");
handBox = new StyleBoxTexture() handBox = new StyleBoxTexture()
{ {
Texture = handsBoxTexture, Texture = handsBoxTexture,
}; };
handBox.SetMargin(StyleBox.Margin.All, 6); handBox.SetPatchMargin(StyleBox.Margin.All, 6);
inactiveHandBox = new StyleBoxTexture(handBox) inactiveHandBox = new StyleBoxTexture(handBox)
{ {
Modulate = _inactiveColor, Modulate = _inactiveColor,

10
Content.Client/UserInterface/NanoStyle.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Client.UserInterface
{ {
Texture = windowBackgroundTex, Texture = windowBackgroundTex,
}; };
windowBackground.SetMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetPatchMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2); windowBackground.SetExpandMargin(StyleBox.Margin.Horizontal | StyleBox.Margin.Bottom, 2);
var buttonNormalTex = resCache.GetResource<TextureResource>("/Nano/button_normal.png").Texture; var buttonNormalTex = resCache.GetResource<TextureResource>("/Nano/button_normal.png").Texture;
@@ -46,7 +46,7 @@ namespace Content.Client.UserInterface
{ {
Texture = buttonNormalTex, Texture = buttonNormalTex,
}; };
buttonNormal.SetMargin(StyleBox.Margin.All, 2); buttonNormal.SetPatchMargin(StyleBox.Margin.All, 2);
buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonNormal.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonHoverTex = resCache.GetResource<TextureResource>("/Nano/button_hover.png").Texture; var buttonHoverTex = resCache.GetResource<TextureResource>("/Nano/button_hover.png").Texture;
@@ -54,7 +54,7 @@ namespace Content.Client.UserInterface
{ {
Texture = buttonHoverTex, Texture = buttonHoverTex,
}; };
buttonHover.SetMargin(StyleBox.Margin.All, 2); buttonHover.SetPatchMargin(StyleBox.Margin.All, 2);
buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonHover.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonPressedTex = resCache.GetResource<TextureResource>("/Nano/button_pressed.png").Texture; var buttonPressedTex = resCache.GetResource<TextureResource>("/Nano/button_pressed.png").Texture;
@@ -62,7 +62,7 @@ namespace Content.Client.UserInterface
{ {
Texture = buttonPressedTex, Texture = buttonPressedTex,
}; };
buttonPressed.SetMargin(StyleBox.Margin.All, 2); buttonPressed.SetPatchMargin(StyleBox.Margin.All, 2);
buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonPressed.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);
var buttonDisabledTex = resCache.GetResource<TextureResource>("/Nano/button_disabled.png").Texture; var buttonDisabledTex = resCache.GetResource<TextureResource>("/Nano/button_disabled.png").Texture;
@@ -70,7 +70,7 @@ namespace Content.Client.UserInterface
{ {
Texture = buttonDisabledTex, Texture = buttonDisabledTex,
}; };
buttonDisabled.SetMargin(StyleBox.Margin.All, 2); buttonDisabled.SetPatchMargin(StyleBox.Margin.All, 2);
buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4); buttonDisabled.SetContentMarginOverride(StyleBox.Margin.Left | StyleBox.Margin.Right, 4);