diff --git a/PCK-Studio/Classes/FileTypes/CSMBFile.cs b/PCK-Studio/Classes/FileTypes/CSMBFile.cs index e4db7b92..a9d00858 100644 --- a/PCK-Studio/Classes/FileTypes/CSMBFile.cs +++ b/PCK-Studio/Classes/FileTypes/CSMBFile.cs @@ -40,13 +40,12 @@ namespace PckStudio.Classes.FileTypes { public List Parts = new List(); public List Offsets = new List(); - } public class CSMBPart { public string Name = "Partname"; - public ParentPart Parent = 0; + public CSMBParentPart Parent = 0; public float posX, posY, posZ = 0.0f; public float sizeX, sizeY, sizeZ = 0.0f; public int uvX, uvY = 0; @@ -55,11 +54,11 @@ namespace PckStudio.Classes.FileTypes } public class CSMBOffset { - public OffsetPart offsetPart = 0; + public CSMBOffsetPart offsetPart = 0; public float VerticalOffset = 0.0f; } - public enum OffsetPart + public enum CSMBOffsetPart { HEAD = 0, BODY = 1, @@ -92,7 +91,7 @@ namespace PckStudio.Classes.FileTypes CHEST = 28 } - public enum ParentPart + public enum CSMBParentPart { HEAD = 0, BODY = 1, diff --git a/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs b/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs index 0ebe928c..0e1313a1 100644 --- a/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs +++ b/PCK-Studio/Classes/IO/CSMB/CSMBFileReader.cs @@ -23,7 +23,7 @@ namespace PckStudio.Classes.IO.CSMB { CSMBPart part = new CSMBPart(); part.Name = ReadString(stream); - part.Parent = (ParentPart)ReadInt(stream); + part.Parent = (CSMBParentPart)ReadInt(stream); part.posX = ReadFloat(stream); part.posY = ReadFloat(stream); part.posZ = ReadFloat(stream); @@ -41,7 +41,7 @@ namespace PckStudio.Classes.IO.CSMB for (int i = 0; i < NumOfOffsets; i++) { CSMBOffset offset = new CSMBOffset(); - offset.offsetPart = (OffsetPart)ReadInt(stream); + offset.offsetPart = (CSMBOffsetPart)ReadInt(stream); offset.VerticalOffset = ReadFloat(stream); BinFile.Offsets.Add(offset); }