Skip to content

Struct Enums convert to/from DisplayName strings #56

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

Open
Olathuss wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Struct Enums convert to/from DisplayName strings #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37b80b2
Struct Enums convert to/from DisplayName strings
Olathuss Apr 25, 2023
6adff7b
Merge branch 'master' into struct-enum-to-string
Olathuss Feb 25, 2025
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
15 changes: 14 additions & 1 deletion Source/LuaMachine/Private/LuaState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,7 +2118,12 @@ FLuaValue ULuaState::FromUProperty(void* Buffer, UProperty * Property, bool& bSu
if (EnumProperty)
{
const uint8* EnumValue = EnumProperty->ContainerPtrToValuePtr<const uint8>(Buffer, Index);
return FLuaValue((int32)*EnumValue);
FString EnumString = EnumProperty->GetEnum()->GetDisplayNameTextByValue((int64)*EnumValue).ToString();
if (EnumString.IsEmpty())
{
return FLuaValue((int32)*EnumValue);
}
return EnumString;
}
#endif

Expand Down Expand Up @@ -2304,6 +2309,14 @@ void ULuaState::ToUProperty(void* Buffer, UProperty * Property, FLuaValue Value,
if (EnumProperty)
{
uint8* EnumValue = EnumProperty->ContainerPtrToValuePtr<uint8>(Buffer, Index);
if (Value.Type == ELuaValueType::String)
{
*EnumValue = EnumProperty->GetEnum()->GetValueByNameString(Value.ToString());
if (*EnumValue != INDEX_NONE)
{
return;
}
}
*EnumValue = Value.ToInteger();
return;
}
Expand Down