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

Remove ISpriteComponent (#13458)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-15 13:38:53 +11:00
committed by GitHub
parent cd10d6fb5e
commit 02aef68dff
40 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/ContextMenu/UI/EntityMenuPresenterGrouping.cs
View File

@@ -36,8 +36,8 @@ namespace Content.Client.ContextMenu.UI
(a, b, entMan) => entMan.GetComponent<MetaDataComponent>(a).EntityPrototype!.ID == entMan.GetComponent<MetaDataComponent>(b).EntityPrototype!.ID,
(a, b, entMan) =>
{
entMan.TryGetComponent<ISpriteComponent?>(a, out var spriteA);
entMan.TryGetComponent<ISpriteComponent?>(b, out var spriteB);
entMan.TryGetComponent<SpriteComponent?>(a, out var spriteA);
entMan.TryGetComponent<SpriteComponent?>(b, out var spriteB);
if (spriteA == null || spriteB == null)
return spriteA == spriteB;
@@ -54,7 +54,7 @@ namespace Content.Client.ContextMenu.UI
(e, entMan) =>
{
var hash = 0;
foreach (var element in entMan.GetComponent<ISpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
foreach (var element in entMan.GetComponent<SpriteComponent>(e).AllLayers.Where(obj => obj.Visible).Select(s => s.RsiState.Name))
{
hash ^= EqualityComparer<string>.Default.GetHashCode(element!);
}