mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Account for empty files

Browse source
This commit is contained in:
Alex Barney 2018-07-24 15:06:12 -05:00
parent f074d89d46
commit a6a9392047
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libhac/Savefile/FileEntry.cs
View file

@ -9,11 +9,12 @@ namespace libhac.Savefile
public int ParentDirIndex { get; } public int ParentDirIndex { get; }
public string Name { get; } public string Name { get; }
public int Field44 { get; } public int Field44 { get; }
public int Offset { get; } public int BlockIndex { get; }
public long Size { get; } public long Size { get; }
public long Field54 { get; } public long Field54 { get; }
public int NextIndex { get; } public int NextIndex { get; }
public long Offset { get; internal set; }
public string FullPath { get; private set; } public string FullPath { get; private set; }
public FileEntry ParentDir { get; internal set; } public FileEntry ParentDir { get; internal set; }
public FileEntry Next { get; internal set; } public FileEntry Next { get; internal set; }
@ -26,7 +27,7 @@ namespace libhac.Savefile
reader.BaseStream.Position = start + 0x44; reader.BaseStream.Position = start + 0x44;
Field44 = reader.ReadInt32(); Field44 = reader.ReadInt32();
Offset = reader.ReadInt32(); BlockIndex = reader.ReadInt32();
Size = reader.ReadInt64(); Size = reader.ReadInt64();
Field54 = reader.ReadInt64(); Field54 = reader.ReadInt64();
NextIndex = reader.ReadInt32(); NextIndex = reader.ReadInt32();

3
libhac/Savefile/Savefile.cs
View file

@ -108,7 +108,7 @@ namespace libhac.Savefile
public Stream OpenFile(FileEntry file) public Stream OpenFile(FileEntry file)
{ {
return new SubStream(JournalStream, file.Offset * Header.Save.BlockSize, file.Size); return new SubStream(JournalStream, file.Offset, file.Size);
} }
public bool FileExists(string filename) => FileDict.ContainsKey(filename); public bool FileExists(string filename) => FileDict.ContainsKey(filename);
@ -142,6 +142,7 @@ namespace libhac.Savefile
if (file.NextIndex != 0) file.Next = fileEntries[file.NextIndex]; if (file.NextIndex != 0) file.Next = fileEntries[file.NextIndex];
if (file.ParentDirIndex != 0 && file.ParentDirIndex < dirEntries.Length) if (file.ParentDirIndex != 0 && file.ParentDirIndex < dirEntries.Length)
file.ParentDir = dirEntries[file.ParentDirIndex]; file.ParentDir = dirEntries[file.ParentDirIndex];
file.Offset = file.BlockIndex < 0 ? 0 : file.BlockIndex * blockSize;
} }
Files = new FileEntry[fileEntries.Length - 2]; Files = new FileEntry[fileEntries.Length - 2];