Cleanup 2 SpriteComponent.GetPrototypeTextures uses (#38263)
Cleanup 2 SpriteComponent.GetPrototypeTextures uses
This commit is contained in:
@@ -454,7 +454,7 @@ public sealed class MappingState : GameplayStateBase
|
||||
switch (prototype)
|
||||
{
|
||||
case EntityPrototype entity:
|
||||
textures.AddRange(SpriteComponent.GetPrototypeTextures(entity, _resources).Select(t => t.Default));
|
||||
textures.AddRange(_sprite.GetPrototypeTextures(entity).Select(t => t.Default));
|
||||
break;
|
||||
case DecalPrototype decal:
|
||||
textures.Add(_sprite.Frame0(decal.Sprite));
|
||||
|
||||
@@ -16,6 +16,7 @@ namespace Content.IntegrationTests.Tests
|
||||
var client = pair.Client;
|
||||
var prototypeManager = client.ResolveDependency<IPrototypeManager>();
|
||||
var resourceCache = client.ResolveDependency<IResourceCache>();
|
||||
var spriteSys = client.System<SpriteSystem>();
|
||||
|
||||
await client.WaitAssertion(() =>
|
||||
{
|
||||
@@ -26,7 +27,7 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
Assert.DoesNotThrow(() =>
|
||||
{
|
||||
var _ = SpriteComponent.GetPrototypeTextures(proto, resourceCache).ToList();
|
||||
var _ = spriteSys.GetPrototypeTextures(proto).ToList();
|
||||
}, "Prototype {0} threw an exception when getting its textures.",
|
||||
proto.ID);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user