epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unexpected RenderSprite.FactionImage fallback.

Browse Source
This commit is contained in:
Paul Chote
2020-09-12 16:34:05 +01:00
committed by abcdefg30
parent ad4d6eaec9
commit 290e214638
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -74,12 +74,8 @@ namespace OpenRA.Mods.Common.Traits.Render
public string GetImage(ActorInfo actor, SequenceProvider sequenceProvider, string faction) public string GetImage(ActorInfo actor, SequenceProvider sequenceProvider, string faction)
{ {
if (FactionImages != null && !string.IsNullOrEmpty(faction)) if (FactionImages != null && !string.IsNullOrEmpty(faction) && FactionImages.TryGetValue(faction, out var factionImage))
{ return factionImage.ToLowerInvariant();
string factionImage = null;
if (FactionImages.TryGetValue(faction, out factionImage) && sequenceProvider.HasSequence(factionImage))
return factionImage;
}
return (Image ?? actor.Name).ToLowerInvariant(); return (Image ?? actor.Name).ToLowerInvariant();
} }