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

Cleanup 2 SpriteComponent.GetPrototypeTextures uses (#38263)

Browse Source 
Cleanup 2 SpriteComponent.GetPrototypeTextures uses
This commit is contained in:
Tayrtahn
2025-06-11 14:15:47 -04:00
committed by GitHub
parent 00789525f8
commit 27cb97a17c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Mapping/MappingState.cs
View File

@@ -454,7 +454,7 @@ public sealed class MappingState : GameplayStateBase
switch (prototype) switch (prototype)
{ {
case EntityPrototype entity: case EntityPrototype entity:
textures.AddRange(SpriteComponent.GetPrototypeTextures(entity, _resources).Select(t => t.Default)); textures.AddRange(_sprite.GetPrototypeTextures(entity).Select(t => t.Default));
break; break;
case DecalPrototype decal: case DecalPrototype decal:
textures.Add(_sprite.Frame0(decal.Sprite)); textures.Add(_sprite.Frame0(decal.Sprite));

3
Content.IntegrationTests/Tests/DummyIconTest.cs
View File

@@ -16,6 +16,7 @@ namespace Content.IntegrationTests.Tests
var client = pair.Client; var client = pair.Client;
var prototypeManager = client.ResolveDependency<IPrototypeManager>(); var prototypeManager = client.ResolveDependency<IPrototypeManager>();
var resourceCache = client.ResolveDependency<IResourceCache>(); var resourceCache = client.ResolveDependency<IResourceCache>();
var spriteSys = client.System<SpriteSystem>();
await client.WaitAssertion(() => await client.WaitAssertion(() =>
{ {
@@ -26,7 +27,7 @@ namespace Content.IntegrationTests.Tests
Assert.DoesNotThrow(() => Assert.DoesNotThrow(() =>
{ {
var _ = SpriteComponent.GetPrototypeTextures(proto, resourceCache).ToList(); var _ = spriteSys.GetPrototypeTextures(proto).ToList();
}, "Prototype {0} threw an exception when getting its textures.", }, "Prototype {0} threw an exception when getting its textures.",
proto.ID); proto.ID);
} }