Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Enable nullability in Content.Client (#3257)

Browse Source 
* Enable nullability in Content.Client

* Remove #nullable enable

* Merge fixes

* Remove Debug.Assert

* Merge fixes

* Fix build

* Fix build
This commit is contained in:
DrSmugleaf
2021-03-10 14:48:29 +01:00
committed by GitHub
parent 4f9bd4e802
commit 902aa128c2
270 changed files with 1774 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs
View File

@@ -6,17 +6,17 @@ namespace Content.Client.GameObjects.Components.Wires
{
public class WiresBoundUserInterface : BoundUserInterface
{
private WiresMenu? _menu;
public WiresBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
{
}
private WiresMenu _menu;
protected override void Open()
{
base.Open();
_menu = new WiresMenu(this);
_menu = new WiresMenu(this);
_menu.OnClose += Close;
_menu.OpenCentered();
}
@@ -24,7 +24,7 @@ namespace Content.Client.GameObjects.Components.Wires
protected override void UpdateState(BoundUserInterfaceState state)
{
base.UpdateState(state);
_menu.Populate((WiresBoundUserInterfaceState) state);
_menu?.Populate((WiresBoundUserInterfaceState) state);
}
public void PerformAction(int id, WiresAction action)
@@ -38,7 +38,7 @@ namespace Content.Client.GameObjects.Components.Wires
if (!disposing)
return;
_menu.Dispose();
_menu?.Dispose();
}
}
}

6
Content.Client/GameObjects/Components/Wires/WiresMenu.cs
View File

@@ -286,8 +286,8 @@ namespace Content.Client.GameObjects.Components.Wires
private const string TextureContact = "/Textures/Interface/WireHacking/contact.svg.96dpi.png";
public event Action WireClicked;
public event Action ContactsClicked;
public event Action? WireClicked;
public event Action? ContactsClicked;
public WireControl(WireColor color, WireLetter letter, bool isCut, bool flip, bool mirror, int type,
IResourceCache resourceCache)
@@ -519,7 +519,7 @@ namespace Content.Client.GameObjects.Components.Wires
}
};
Animation animation = null;
Animation? animation = null;
switch (data.State)
{