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

Only query the palette attribute once in CheckPalettes

Browse Source
This commit is contained in:
abcdefg30
2022-09-14 11:51:47 +02:00
committed by Matthias Mailänder
parent ae7fc11472
commit 0bbcff973f
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
OpenRA.Mods.Common/Lint/CheckPalettes.cs
View File

@@ -40,21 +40,20 @@ namespace OpenRA.Mods.Common.Lint
foreach (var traitInfo in actorInfo.Value.TraitInfos<TraitInfo>()) foreach (var traitInfo in actorInfo.Value.TraitInfos<TraitInfo>())
{ {
var fields = traitInfo.GetType().GetFields(); var fields = traitInfo.GetType().GetFields();
foreach (var field in fields.Where(x => x.HasAttribute<PaletteReferenceAttribute>())) foreach (var field in fields)
{ {
var isPlayerPalette = false;
var paletteReference = field.GetCustomAttributes<PaletteReferenceAttribute>(true).FirstOrDefault(); var paletteReference = field.GetCustomAttributes<PaletteReferenceAttribute>(true).FirstOrDefault();
if (paletteReference != null) if (paletteReference == null)
continue;
var isPlayerPalette = false;
if (!string.IsNullOrEmpty(paletteReference.PlayerPaletteReferenceSwitch))
{ {
if (!string.IsNullOrEmpty(paletteReference.PlayerPaletteReferenceSwitch)) var fieldInfo = fields.First(f => f.Name == paletteReference.PlayerPaletteReferenceSwitch);
{ isPlayerPalette = (bool)fieldInfo.GetValue(traitInfo);
var fieldInfo = fields.First(f => f.Name == paletteReference.PlayerPaletteReferenceSwitch);
isPlayerPalette = (bool)fieldInfo.GetValue(traitInfo);
}
else
isPlayerPalette = paletteReference.IsPlayerPalette;
} }
else
isPlayerPalette = paletteReference.IsPlayerPalette;
var references = LintExts.GetFieldValues(traitInfo, field); var references = LintExts.GetFieldValues(traitInfo, field);
foreach (var reference in references) foreach (var reference in references)
@@ -84,21 +83,20 @@ namespace OpenRA.Mods.Common.Lint
continue; continue;
var fields = projectileInfo.GetType().GetFields(); var fields = projectileInfo.GetType().GetFields();
foreach (var field in fields.Where(x => x.HasAttribute<PaletteReferenceAttribute>())) foreach (var field in fields)
{ {
var isPlayerPalette = false; var paletteReference = field.GetCustomAttributes<PaletteReferenceAttribute>(true).FirstOrDefault();
if (paletteReference == null)
continue;
var paletteReference = field.GetCustomAttributes<PaletteReferenceAttribute>(true).First(); var isPlayerPalette = false;
if (paletteReference != null) if (!string.IsNullOrEmpty(paletteReference.PlayerPaletteReferenceSwitch))
{ {
if (!string.IsNullOrEmpty(paletteReference.PlayerPaletteReferenceSwitch)) var fieldInfo = fields.First(f => f.Name == paletteReference.PlayerPaletteReferenceSwitch);
{ isPlayerPalette = (bool)fieldInfo.GetValue(projectileInfo);
var fieldInfo = fields.First(f => f.Name == paletteReference.PlayerPaletteReferenceSwitch);
isPlayerPalette = (bool)fieldInfo.GetValue(projectileInfo);
}
else
isPlayerPalette = paletteReference.IsPlayerPalette;
} }
else
isPlayerPalette = paletteReference.IsPlayerPalette;
var references = LintExts.GetFieldValues(projectileInfo, field); var references = LintExts.GetFieldValues(projectileInfo, field);
foreach (var reference in references) foreach (var reference in references)
@@ -128,9 +126,12 @@ namespace OpenRA.Mods.Common.Lint
foreach (var traitInfo in actorInfo.Value.TraitInfos<TraitInfo>()) foreach (var traitInfo in actorInfo.Value.TraitInfos<TraitInfo>())
{ {
var fields = traitInfo.GetType().GetFields(); var fields = traitInfo.GetType().GetFields();
foreach (var field in fields.Where(x => x.HasAttribute<PaletteDefinitionAttribute>())) foreach (var field in fields)
{ {
var paletteDefinition = field.GetCustomAttributes<PaletteDefinitionAttribute>(true).First(); var paletteDefinition = field.GetCustomAttributes<PaletteDefinitionAttribute>(true).FirstOrDefault();
if (paletteDefinition == null)
continue;
var values = LintExts.GetFieldValues(traitInfo, field); var values = LintExts.GetFieldValues(traitInfo, field);
foreach (var value in values) foreach (var value in values)
{ {