Cleanup warnings in ClientInnerBodySystem (#37450)
* Cleanup warnings in ClientInnerBodySystem * Apply suggested simplification
This commit is contained in:
@@ -7,6 +7,8 @@ namespace Content.Client.Anomaly.Effects;
|
|||||||
|
|
||||||
public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
|
public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
|
||||||
{
|
{
|
||||||
|
[Dependency] private readonly SpriteSystem _sprite = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
SubscribeLocalEvent<InnerBodyAnomalyComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
|
SubscribeLocalEvent<InnerBodyAnomalyComponent, AfterAutoHandleStateEvent>(OnAfterHandleState);
|
||||||
@@ -21,21 +23,20 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
|
|||||||
if (ent.Comp.FallbackSprite is null)
|
if (ent.Comp.FallbackSprite is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index))
|
var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap);
|
||||||
index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap);
|
|
||||||
|
|
||||||
if (TryComp<BodyComponent>(ent, out var body) &&
|
if (TryComp<BodyComponent>(ent, out var body) &&
|
||||||
body.Prototype is not null &&
|
body.Prototype is not null &&
|
||||||
ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
|
ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite))
|
||||||
{
|
{
|
||||||
sprite.LayerSetSprite(index, speciesSprite);
|
_sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprite.LayerSetSprite(index, ent.Comp.FallbackSprite);
|
_sprite.LayerSetSprite((ent.Owner, sprite), index, ent.Comp.FallbackSprite);
|
||||||
}
|
}
|
||||||
|
|
||||||
sprite.LayerSetVisible(index, true);
|
_sprite.LayerSetVisible((ent.Owner, sprite), index, true);
|
||||||
sprite.LayerSetShader(index, "unshaded");
|
sprite.LayerSetShader(index, "unshaded");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +45,7 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem
|
|||||||
if (!TryComp<SpriteComponent>(ent, out var sprite))
|
if (!TryComp<SpriteComponent>(ent, out var sprite))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var index = sprite.LayerMapGet(ent.Comp.LayerMap);
|
var index = _sprite.LayerMapGet((ent.Owner, sprite), ent.Comp.LayerMap);
|
||||||
sprite.LayerSetVisible(index, false);
|
_sprite.LayerSetVisible((ent.Owner, sprite), index, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user