From caf19f24cbc5b3e5bb1f2095d5db296cfcc2774a Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Mon, 6 Jun 2022 21:17:27 +0200 Subject: [PATCH] Fix removal of EST bones. --- Penumbra/Meta/Files/EstFile.cs | 9 +++++++-- Penumbra/UI/ConfigWindow.DebugTab.cs | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Penumbra/Meta/Files/EstFile.cs b/Penumbra/Meta/Files/EstFile.cs index cd67a6ba..822286d0 100644 --- a/Penumbra/Meta/Files/EstFile.cs +++ b/Penumbra/Meta/Files/EstFile.cs @@ -88,9 +88,14 @@ public sealed unsafe class EstFile : MetaBaseFile control[ i ] = control[ i + 1 ]; } - for( var i = 0; i < Count; ++i ) + for( var i = 0; i < idx; ++i ) { - entries[ i - 2 ] = entries[ i + 1 ]; + entries[ i - 2 ] = entries[ i ]; + } + + for( var i = idx; i < Count - 1; ++i ) + { + entries[i - 2] = entries[i + 1]; } entries[ Count - 3 ] = 0; diff --git a/Penumbra/UI/ConfigWindow.DebugTab.cs b/Penumbra/UI/ConfigWindow.DebugTab.cs index 879b4385..a54bf137 100644 --- a/Penumbra/UI/ConfigWindow.DebugTab.cs +++ b/Penumbra/UI/ConfigWindow.DebugTab.cs @@ -232,7 +232,7 @@ public partial class ConfigWindow var (data, length) = resource->GetData(); if( data != IntPtr.Zero && length > 0 ) { - ImGui.SetClipboardText( string.Join( " ", + ImGui.SetClipboardText( string.Join( "\n", new ReadOnlySpan< byte >( ( byte* )data, length ).ToArray().Select( b => b.ToString( "X2" ) ) ) ); } } @@ -245,7 +245,7 @@ public partial class ConfigWindow ImGui.Selectable( $"0x{Penumbra.CharacterUtility.DefaultResources[ i ].Address:X}" ); if( ImGui.IsItemClicked() ) { - ImGui.SetClipboardText( string.Join( " ", + ImGui.SetClipboardText( string.Join( "\n", new ReadOnlySpan< byte >( ( byte* )Penumbra.CharacterUtility.DefaultResources[ i ].Address, Penumbra.CharacterUtility.DefaultResources[ i ].Size ).ToArray().Select( b => b.ToString( "X2" ) ) ) ); }