INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

When parsing StructuredDataDefs accept undefined types

Browse Source
This commit is contained in:
Jan
2022-03-22 12:03:15 +01:00
parent 49c774b1e6
commit dc075847ff
7 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.cpp
View File

@ -96,7 +96,7 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
{
const auto& enumedArray = def.m_enumed_arrays[currentType.m_info.type_index];
if(enumedArray.m_enum_index < def.m_enums.size())
if (enumedArray.m_enum_index < def.m_enums.size())
{
const auto& _enum = *def.m_enums[enumedArray.m_enum_index];
checksum = crc32(checksum, reinterpret_cast<const Bytef*>(_enum.m_name.c_str()), _enum.m_name.size() + 1);
@ -116,10 +116,18 @@ uint32_t CommonStructuredDataStruct::CalculateChecksum(const CommonStructuredDat
return checksum;
}
void CommonStructuredDataStruct::SortProperties()
void CommonStructuredDataStruct::SortPropertiesByOffset()
{
std::sort(m_properties.begin(), m_properties.end(), [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2)
{
return e1.m_offset_in_bits < e2.m_offset_in_bits;
});
}
void CommonStructuredDataStruct::SortPropertiesByName()
{
std::sort(m_properties.begin(), m_properties.end(), [](const CommonStructuredDataStructProperty& e1, const CommonStructuredDataStructProperty& e2)
{
return e1.m_name < e2.m_name;
});
}

3
src/ObjCommon/StructuredDataDef/CommonStructuredDataStruct.h
View File

@ -30,5 +30,6 @@ struct CommonStructuredDataStruct
_NODISCARD uint32_t CalculateChecksum(const CommonStructuredDataDef& def, uint32_t initialValue) const;
void SortProperties();
void SortPropertiesByOffset();
void SortPropertiesByName();
};