Support decompilation of an array of bools; Fixes #59.

EliotVU · Jan 14, 2023 · e55cfce · e55cfce
1 parent 889b671
commit e55cfce
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 21 deletions.
diff --git a/src/Core/Classes/UDefaultProperty.cs b/src/Core/Classes/UDefaultProperty.cs
@@ -77,26 +77,38 @@ public string Decompile()
             }
 
             var arrayIndex = string.Empty;
-            if (ArrayIndex > 0 && Type != PropertyType.BoolProperty)
+            if (ArrayIndex > 0)
             {
                 arrayIndex += $"[{ArrayIndex}]";
             }
 
             return $"{Name}{arrayIndex}={value}";
         }
 
-        private UProperty FindProperty(out UStruct outer)
+        [CanBeNull]
+        private T FindProperty<T>(out UStruct outer)
+            where T : UProperty
         {
             UProperty property = null;
-            outer = _Outer ?? _Container.Class as UStruct;
-            for (var structField = outer; structField != null; structField = structField.Super)
+            outer = _Outer ?? (UStruct)_Container.Class;
+            Debug.Assert(outer != null, nameof(outer) + " != null");
+            foreach (var super in outer.EnumerateSuper(outer))
             {
-                if (structField.Variables == null || !structField.Variables.Any())
+                foreach (var field in super
+                             .EnumerateFields()
+                             .OfType<UProperty>())
                 {
-                    continue;
+                    // FIXME: UName
+                    if (field.Table.ObjectName != Name)
+                    {
+                        continue;
+                    }
+
+                    property = field;
+                    outer = super;
+                    break;
                 }
 
-                property = structField.Variables.Find(i => i.Table.ObjectName == Name);
                 if (property == null)
                 {
                     continue;
@@ -109,25 +121,20 @@ private UProperty FindProperty(out UStruct outer)
                         break;
 
                     case PropertyType.ArrayProperty:
-                        var arrayField = property as UArrayProperty;
+                        var arrayField = (UArrayProperty)property;
                         Debug.Assert(arrayField != null, "arrayField != null");
                         var arrayInnerField = arrayField.InnerProperty;
                         if (arrayInnerField.Type == PropertyType.StructProperty)
                         {
-                            _Outer = ((UStructProperty)arrayInnerField).StructObject;
+                            outer = ((UStructProperty)arrayInnerField).StructObject;
                         }
 
                         break;
-
-                    default:
-                        outer = structField;
-                        break;
                 }
-
                 break;
             }
 
-            return property;
+            return (T)property;
         }
 
         [Conditional("BINARYMETADATA")]
@@ -568,14 +575,18 @@ private string DeserializeDefaultPropertyValue(PropertyType type, ref Deserializ
             {
                 case PropertyType.BoolProperty:
                 {
-                    Debug.Assert(BoolValue != null, nameof(BoolValue) + " != null");
-                    bool value = BoolValue.Value;
-                    if (Size == 1 && _Buffer.Version < (uint)PackageObjectLegacyVersion.UE3)
+                    bool value;
+                    if (Size == 0)
+                    {
+                        Debug.Assert(BoolValue != null, nameof(BoolValue) + " != null");
+                        value = BoolValue.Value;
+                    }
+                    else
                     {
                         value = _Buffer.ReadByte() > 0;
-                        Record(nameof(value), value);
                     }
 
+                    Record(nameof(value), value);
                     propertyValue = value ? "true" : "false";
                     break;
                 }

diff --git a/src/Core/Classes/UField.cs b/src/Core/Classes/UField.cs
@@ -48,7 +48,15 @@ public IEnumerable<UStruct> EnumerateSuper()
                 yield return super;
             }
         }
-
+
+        public IEnumerable<UStruct> EnumerateSuper(UStruct super)
+        {
+            for (; super != null; super = super.Super)
+            {
+                yield return super;
+            }
+        }
+
         public IEnumerable<UField> EnumerateNext()
         {
             for (var next = NextField; next != null; next = next.NextField)
@@ -82,4 +90,4 @@ public string GetSuperGroup()
             return group + Name;
         }
     }
-}
+}