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

Fix warnings and code cleanup/fixes (#13570)

Browse Source
This commit is contained in:
Visne
2023-01-19 03:56:45 +01:00
committed by GitHub
parent 3ca5a0224b
commit c6d3e4f3bd
265 changed files with 499 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
View File

@@ -886,7 +886,6 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
/// If currently targeting with no slot or a different slot, switches to
/// targeting with the specified slot.
/// </summary>
/// <param name="slot"></param>
public void ToggleTargeting(TargetedAction action)
{
if (SelectingTargetFor == action)
@@ -952,7 +951,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
_targetOutline?.Disable();
_interactionOutline?.SetEnabled(true);
if (!_overlays.TryGetOverlay<ShowHandItemOverlay>(out var handOverlay) || handOverlay == null)
if (!_overlays.TryGetOverlay<ShowHandItemOverlay>(out var handOverlay))
return;
handOverlay.IconOverride = null;

1
Content.Client/UserInterface/Systems/Actions/Widgets/ActionsBar.xaml
View File

@@ -1,7 +1,6 @@
<widgets:ActionsBar
xmlns="https://spacestation14.io"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:in="clr-namespace:Content.Shared.Input;assembly=Content.Shared"
xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Actions.Widgets"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Actions.Controls"
VerticalExpand="False"

2
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -141,7 +141,7 @@ public sealed class AHelpUIController: UIController, IOnStateChanged<GameplaySta
return;
UIHelper?.Dispose();
var ownerUserId = _playerManager!.LocalPlayer!.UserId;
var ownerUserId = _playerManager.LocalPlayer!.UserId;
UIHelper = isAdmin ? new AdminAHelpUIHandler(ownerUserId) : new UserAHelpUIHandler(ownerUserId);
UIHelper.SendMessageAction = (userId, textMessage) => _bwoinkSystem?.Send(userId, textMessage);

1
Content.Client/UserInterface/Systems/Character/Controls/CharacterObjectiveControl.xaml
View File

@@ -1,6 +1,5 @@
<controls:CharacterObjectiveControl
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Character.Controls"
Orientation="Vertical"
Modulate="#808080">

2
Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
View File

@@ -11,7 +11,7 @@ public sealed class ChannelFilterButton : ContainerButton
private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
private static readonly Color ColorHovered = Color.FromHex("#9699bb");
private static readonly Color ColorPressed = Color.FromHex("#789B8C");
private readonly TextureRect _textureRect;
private readonly TextureRect? _textureRect;
public readonly ChannelFilterPopup ChatFilterPopup;
private readonly ChatUIController _chatUIController;
private const int FilterDropdownOffset = 120;

2
Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs
View File

@@ -21,7 +21,7 @@ public sealed class InventoryDisplay : LayoutContainer
AddChild(resizer);
}
public SlotControl? AddButton(SlotControl newButton, Vector2i buttonOffset)
public SlotControl AddButton(SlotControl newButton, Vector2i buttonOffset)
{
AddChild(newButton);
HorizontalExpand = true;

1
Content.Client/UserInterface/Systems/Objectives/Controls/ObjectiveBriefingControl.xaml
View File

@@ -1,6 +1,5 @@
<controls:ObjectiveBriefingControl
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Systems.Objectives.Controls"
Orientation="Horizontal">
<Label Name="Label" Access="Public" Modulate="#FFFF00"/>