From bc48e0e45e7ad73a5b14433d2261adaccb9dd77c Mon Sep 17 00:00:00 2001 From: dexy Date: Thu, 18 Jul 2024 15:23:29 +1000 Subject: [PATCH] PR #251 with additional fix --- CodeWalker.Core/GameFiles/MetaTypes/Meta.cs | 8 ++++++++ CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs | 7 +------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CodeWalker.Core/GameFiles/MetaTypes/Meta.cs b/CodeWalker.Core/GameFiles/MetaTypes/Meta.cs index 5fbb9b1..e8cb528 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/Meta.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/Meta.cs @@ -1024,6 +1024,14 @@ namespace CodeWalker.GameFiles return new[] { b0, b1, b2, b3, b4 }; } } + [TC(typeof(EXP))] public struct ArrayOfFloats5 + { + public float f0, f1, f2, f3, f4; + public float[] GetArray() + { + return new[] { f0, f1, f2, f3, f4 }; + } + } [TC(typeof(EXP))] public struct ArrayOfBytes6 //array of 6 bytes { public byte b0, b1, b2, b3, b4, b5; diff --git a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs index 7550ea7..7bbee5b 100644 --- a/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs +++ b/CodeWalker.Core/GameFiles/MetaTypes/MetaTypes.cs @@ -6379,12 +6379,7 @@ namespace CodeWalker.GameFiles { public MetaHash pedXml_audioID { get; set; } //0 0: Hash: 0: 802196719 public MetaHash pedXml_audioID2 { get; set; } //4 4: Hash: 0: 4233133352 - public ArrayOfBytes5 pedXml_expressionMods { get; set; } //8 8: ArrayOfBytes: 5: 128864925 - public byte Unused0 { get; set; }//13 - public ushort Unused1 { get; set; }//14 - public uint Unused2 { get; set; }//16 - public uint Unused3 { get; set; }//20 - public uint Unused4 { get; set; }//24 + public ArrayOfFloats5 pedXml_expressionMods { get; set; } //8 8: ArrayOfBytes: 5: 128864925 public uint flags { get; set; } //28 28: UnsignedInt: 0: flags public int inclusions { get; set; } //32 32: IntFlags2: 0: inclusions//2172318933 public int exclusions { get; set; } //36 36: IntFlags2: 0: exclusions