Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-29 16:00:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix part pane crash bug in newer layout versions.

Browse source
This commit is contained in:
KillzXGaming 2020-08-31 18:34:25 -04:00
parent 6b88b26038
commit 88b84a9a8d
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
File_Format_Library/FileFormats/Layout/CAFE/Panes/PRT1.cs
View file

@ -282,6 +282,8 @@ namespace LayoutBXLYT.Cafe
public byte BasicUsageFlag { get; set; } public byte BasicUsageFlag { get; set; }
public byte MaterialUsageFlag { get; set; } public byte MaterialUsageFlag { get; set; }
public uint Unknown { get; set; }
public BasePane Property { get; set; } public BasePane Property { get; set; }
public USD1 UserData { get; set; } public USD1 UserData { get; set; }
@ -295,8 +297,15 @@ namespace LayoutBXLYT.Cafe
BasicUsageFlag = reader.ReadByte(); BasicUsageFlag = reader.ReadByte();
MaterialUsageFlag = reader.ReadByte(); MaterialUsageFlag = reader.ReadByte();
reader.ReadByte(); //padding reader.ReadByte(); //padding
uint userDataOffset = 0;
uint propertyOffset = reader.ReadUInt32(); uint propertyOffset = reader.ReadUInt32();
uint userDataOffset = reader.ReadUInt32(); if (header.VersionMajor >= 8) {
Unknown = reader.ReadUInt32();
}
else
userDataOffset = reader.ReadUInt32();
uint panelInfoOffset = reader.ReadUInt32(); uint panelInfoOffset = reader.ReadUInt32();
long pos = reader.Position; long pos = reader.Position;
@ -333,13 +342,14 @@ namespace LayoutBXLYT.Cafe
break; break;
} }
} }
Console.WriteLine($"userDataOffset {userDataOffset}");
if (userDataOffset != 0) if (userDataOffset != 0)
{ {
reader.SeekBegin(StartPosition + userDataOffset); reader.SeekBegin(StartPosition + userDataOffset);
reader.ReadUInt32();//magic reader.ReadUInt32();//magic
reader.ReadUInt32();//section size reader.ReadUInt32();//section size
UserData = new USD1(reader, header); // UserData = new USD1(reader, header);
} }
if (panelInfoOffset != 0) if (panelInfoOffset != 0)
{ {
@ -361,7 +371,10 @@ namespace LayoutBXLYT.Cafe
//Reserve offset spaces //Reserve offset spaces
_ofsPos = writer.Position; _ofsPos = writer.Position;
writer.Write(0); //Property Offset writer.Write(0); //Property Offset
writer.Write(0); //External User Data if (header.VersionMajor >= 8)
writer.Write(Unknown);
else
writer.Write(0); //External User Data
writer.Write(0); //Panel Info Offset writer.Write(0); //Panel Info Offset
} }