universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix FPK data format saving

Browse Source
This commit is contained in:
Michael Becker 2020-04-03 11:45:02 -04:00
parent dfb444780f
commit b347582b41
No known key found for this signature in database
GPG Key ID: 389DFF5D73781A12
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Libraries/UniversalEditor.Core/IO/Writer.cs
View File

@ -168,6 +168,13 @@ namespace UniversalEditor.IO
WriteBytes(realData);
}
public long CalculateAlignment(long currentPosition, long alignTo, long extraPadding = 0)
{
long paddingCount = ((alignTo - (currentPosition % alignTo)) % alignTo);
paddingCount += extraPadding;
return paddingCount;
}
public void WriteLengthPrefixedString(string value)
{
WriteLengthPrefixedString(value, base.Accessor.DefaultEncoding);

6
Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/Eighting/FPK/FPKDataFormat.cs
View File

@ -16,7 +16,7 @@ namespace UniversalEditor.DataFormats.FileSystem.Eighting.FPK
{
_dfr = base.MakeReferenceInternal();
_dfr.Capabilities.Add(typeof(FileSystemObjectModel), DataFormatCapabilities.All);
_dfr.ExportOptions.Add(new CustomOptionNumber(nameof(DataAlignment), "Data &alignment (in bytes): ", 16, 0, UInt32.MaxValue));
_dfr.ExportOptions.Add(new CustomOptionNumber(nameof(DataAlignment), "Data _alignment (in bytes): ", 16, 0, UInt32.MaxValue));
_dfr.Sources.Add("http://wiki.xentax.com/index.php?title=Bleach_%28PSP%29");
}
return _dfr;
@ -94,7 +94,7 @@ namespace UniversalEditor.DataFormats.FileSystem.Eighting.FPK
long archiveSizePosition = base.Accessor.Position;
writer.WriteUInt32(archiveSize);
uint offset = (uint)(base.Accessor.Position + (48 * files.Length));
uint offset = (uint)(16 + (48 * files.Length));
byte[][] compressedDatas = new byte[files.Length][];
bool[] compressed = new bool[files.Length];
@ -115,7 +115,7 @@ namespace UniversalEditor.DataFormats.FileSystem.Eighting.FPK
offset += (uint)(compressedData.Length + 1);
long count = (offset % mvarDataAlignment);
long count = writer.CalculateAlignment(offset, mvarDataAlignment); // (offset % mvarDataAlignment);
offset += (uint)count;
}
for (int i = 0; i < files.Length; i++)