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

Fix RotationPaletteEffect not working with player palettes

Browse Source
This commit is contained in:
reaperrr
2017-07-12 23:55:54 +02:00
committed by Paul Chote
parent 0b6b997e81
commit b859b9ee43
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/PaletteEffects/RotationPaletteEffect.cs
View File

@@ -92,8 +92,8 @@ namespace OpenRA.Mods.Common.Traits
foreach (var kvp in palettes) foreach (var kvp in palettes)
{ {
if ((info.Palettes.Count > 0 && !AnyPaletteNameStartsWith(info.Palettes, kvp.Key)) if ((info.Palettes.Count > 0 && !StartsWithAny(kvp.Key, info.Palettes))
|| (info.ExcludePalettes.Count > 0 && AnyPaletteNameStartsWith(info.ExcludePalettes, kvp.Key))) || (info.ExcludePalettes.Count > 0 && StartsWithAny(kvp.Key, info.ExcludePalettes)))
continue; continue;
var palette = kvp.Value; var palette = kvp.Value;
@@ -106,11 +106,11 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
static bool AnyPaletteNameStartsWith(HashSet<string> names, string prefix) static bool StartsWithAny(string name, HashSet<string> prefixes)
{ {
// PERF: Avoid LINQ. // PERF: Avoid LINQ.
foreach (var name in names) foreach (var pref in prefixes)
if (name.StartsWith(prefix)) if (name.StartsWith(pref))
return true; return true;
return false; return false;