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

Fix funky nullability making rotatable verbs not show up

Browse Source 
Fixes #3656
This commit is contained in:
Vera Aguilera Puerto
2021-03-14 23:21:52 +01:00
parent 8eeaa923a8
commit fc7ad61afe
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -223,10 +223,9 @@ namespace Content.Client.GameObjects.EntitySystems
first = false; first = false;
if (groupIcons.TryGetValue(category, out var icon)) groupIcons.TryGetValue(category, out var icon);
{
vBox.AddChild(CreateCategoryButton(category, verbs, icon)); vBox.AddChild(CreateCategoryButton(category, verbs, icon));
}
} }
if (buttons.ContainsKey("")) if (buttons.ContainsKey(""))
@@ -290,7 +289,7 @@ namespace Content.Client.GameObjects.EntitySystems
return button; return button;
} }
private Control CreateCategoryButton(string text, List<ListedVerbData> verbButtons, SpriteSpecifier icon) private Control CreateCategoryButton(string text, List<ListedVerbData> verbButtons, SpriteSpecifier? icon)
{ {
verbButtons.Sort((a, b) => string.Compare(a.Text, b.Text, StringComparison.CurrentCulture)); verbButtons.Sort((a, b) => string.Compare(a.Text, b.Text, StringComparison.CurrentCulture));
@@ -411,7 +410,7 @@ namespace Content.Client.GameObjects.EntitySystems
set => _icon.Texture = value; set => _icon.Texture = value;
} }
public VerbGroupButton(VerbSystem system, List<ListedVerbData> verbButtons, SpriteSpecifier icon) public VerbGroupButton(VerbSystem system, List<ListedVerbData> verbButtons, SpriteSpecifier? icon)
{ {
_system = system; _system = system;
VerbButtons = verbButtons; VerbButtons = verbButtons;

4
Resources/Changelog/Parts/rotatable.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Zumorica
changes:
- type: Fix
message: Fixes rotatable verbs not showing in the context menu.