From 87374e0a63920cb88cd01fca385c9d6fed66255e Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Tue, 5 Nov 2019 19:40:17 +0100 Subject: [PATCH] Model: Use FIELD_ATTRIBUTE_HAS_DEFAULT to determine if a field has a default value --- Il2CppInspector/Reflection/FieldInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Il2CppInspector/Reflection/FieldInfo.cs b/Il2CppInspector/Reflection/FieldInfo.cs index 51feb7a..81a7442 100644 --- a/Il2CppInspector/Reflection/FieldInfo.cs +++ b/Il2CppInspector/Reflection/FieldInfo.cs @@ -18,7 +18,7 @@ namespace Il2CppInspector.Reflection { // Custom attributes for this member public override IEnumerable CustomAttributes => CustomAttributeData.GetCustomAttributes(this); - public bool HasDefaultValue { get; } + public bool HasDefaultValue => (Attributes & FieldAttributes.HasDefault) != 0; public object DefaultValue { get; } public string DefaultValueString => HasDefaultValue ? DefaultValue.ToCSharpValue() : ""; @@ -105,12 +105,12 @@ namespace Il2CppInspector.Reflection { Attributes |= FieldAttributes.SpecialName; if ((fieldType.attrs & Il2CppConstants.FIELD_ATTRIBUTE_PINVOKE_IMPL) == Il2CppConstants.FIELD_ATTRIBUTE_PINVOKE_IMPL) Attributes |= FieldAttributes.PinvokeImpl; + if ((fieldType.attrs & Il2CppConstants.FIELD_ATTRIBUTE_HAS_DEFAULT) != 0) + Attributes |= FieldAttributes.HasDefault; // Default initialization value if present - if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out object variant)) { - HasDefaultValue = true; + if (pkg.FieldDefaultValue.TryGetValue(fieldIndex, out object variant)) DefaultValue = variant; - } } } } \ No newline at end of file