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

Fix a few warnings (#11576)

Browse Source
This commit is contained in:
metalgearsloth
2022-10-04 14:24:19 +11:00
committed by GitHub
parent a6d20803a6
commit 600c0e3255
43 changed files with 185 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Verbs/UI/VerbMenuElement.cs
View File

@@ -24,7 +24,7 @@ namespace Content.Client.Verbs.UI
public bool TextVisible { set => Label.Visible = value; }
// Top quality variable naming
public Verb? Verb;
public readonly Verb? Verb;
public VerbMenuElement(Verb verb) : base(verb.Text)
{
@@ -41,12 +41,14 @@ namespace Content.Client.Verbs.UI
ExpansionIndicator.Visible = true;
}
var entManager = IoCManager.Resolve<IEntityManager>();
if (verb.Icon == null && verb.IconEntity != null)
{
var spriteView = new SpriteView()
{
OverrideDirection = Direction.South,
Sprite = IoCManager.Resolve<IEntityManager>().GetComponentOrNull<ISpriteComponent>(verb.IconEntity.Value)
Sprite = entManager.GetComponentOrNull<ISpriteComponent>(verb.IconEntity.Value)
};
Icon.AddChild(spriteView);
@@ -55,7 +57,7 @@ namespace Content.Client.Verbs.UI
Icon.AddChild(new TextureRect()
{
Texture = verb.Icon?.Frame0(),
Texture = verb.Icon != null ? entManager.System<SpriteSystem>().Frame0(verb.Icon) : null,
Stretch = TextureRect.StretchMode.KeepAspectCentered
});
}
@@ -66,7 +68,7 @@ namespace Content.Client.Verbs.UI
Icon.AddChild(new TextureRect()
{
Texture = category.Icon?.Frame0(),
Texture = category.Icon != null ? IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<SpriteSystem>().Frame0(category.Icon) : null,
Stretch = TextureRect.StretchMode.KeepAspectCentered
});
}