diff --git a/Penumbra/Meta/Files/EqdpFile.cs b/Penumbra/Meta/Files/EqdpFile.cs index c0f2add2..6de0007d 100644 --- a/Penumbra/Meta/Files/EqdpFile.cs +++ b/Penumbra/Meta/Files/EqdpFile.cs @@ -66,12 +66,10 @@ public sealed unsafe class ExpandedEqdpFile : MetaBaseFile var def = ( byte* )DefaultData.Data; Functions.MemCpyUnchecked( Data, def, IdentifierSize + PreambleSize ); - var controlPtr = ( ushort* )( def + IdentifierSize + PreambleSize ); - var dataBasePtr = controlPtr + BlockCount; - var myDataPtrStart = ( ushort* )( Data + IdentifierSize + PreambleSize + 2 * BlockCount ); - var myDataPtr = myDataPtrStart; - var myControlPtr = ( ushort* )( Data + IdentifierSize + PreambleSize ); - var x = new ReadOnlySpan< ushort >( ( ushort* )Data, Length / 2 ); + var controlPtr = ( ushort* )( def + IdentifierSize + PreambleSize ); + var dataBasePtr = controlPtr + BlockCount; + var myDataPtr = ( ushort* )( Data + IdentifierSize + PreambleSize + 2 * BlockCount ); + var myControlPtr = ( ushort* )( Data + IdentifierSize + PreambleSize ); for( var i = 0; i < BlockCount; ++i ) { if( controlPtr[ i ] == CollapsedBlock ) @@ -80,8 +78,6 @@ public sealed unsafe class ExpandedEqdpFile : MetaBaseFile } else { - var y = new ReadOnlySpan< ushort >( dataBasePtr + controlPtr[ i ], BlockSize ); - var z = new ReadOnlySpan< ushort >( myDataPtr, BlockSize ); Functions.MemCpyUnchecked( myDataPtr, dataBasePtr + controlPtr[ i ], BlockSize * EqdpEntrySize ); } diff --git a/Penumbra/Meta/Manager/MetaManager.Imc.cs b/Penumbra/Meta/Manager/MetaManager.Imc.cs index 8dee907f..a67f79c6 100644 --- a/Penumbra/Meta/Manager/MetaManager.Imc.cs +++ b/Penumbra/Meta/Manager/MetaManager.Imc.cs @@ -56,7 +56,7 @@ public partial class MetaManager Manipulations.Clear(); } - public unsafe bool ApplyMod( ImcManipulation m, Mod.Mod mod ) + public bool ApplyMod( ImcManipulation m, Mod.Mod mod ) { #if USE_IMC if( !Manipulations.TryAdd( m, mod ) )