Skip to content

[ResourceLib] Accept bare enum ints, don't clear unknown #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OrfeasZ merged 1 commit into from
Oct 22, 2026
Merged

[ResourceLib] Accept bare enum ints, don't clear unknown #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Libraries/ResourceLib/Src/ZHM/ZHMTypeInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,28 @@ class ZHMEnumTypeInfo : public IZHMTypeInfo
case 2: s_Value = *reinterpret_cast<int16_t*>(p_Object); break;
default: s_Value = *reinterpret_cast<int32_t*>(p_Object); break;
}
p_Stream << simdjson::as_json_string(ZHMEnums::GetEnumValueName(m_TypeName, s_Value));

const std::string s_Name = ZHMEnums::GetEnumValueName(m_TypeName, s_Value);

if (s_Name.empty())
p_Stream << s_Value;
else
p_Stream << simdjson::as_json_string(s_Name);
}

void CreateFromJson(simdjson::ondemand::value p_Document, void* p_Target) override
{
const int32_t s_Value = ZHMEnums::GetEnumValueByName(m_TypeName, std::string_view(p_Document));
int32_t s_Value = 0;

if (p_Document.type() == simdjson::ondemand::json_type::number)
{
s_Value = simdjson::from_json_int32(p_Document);
}
else
{
s_Value = ZHMEnums::GetEnumValueByName(m_TypeName, std::string_view(p_Document));
}

switch (m_Size)
{
case 1: *reinterpret_cast<int8_t*>(p_Target) = static_cast<int8_t>(s_Value); break;
Expand Down