Skip to content

fix(UE): use UTF8 instead of ANSI encoding #149

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
JBenda merged 1 commit into from
May 8, 2026
Merged

fix(UE): use UTF8 instead of ANSI encoding #149

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion inkcpp/runner_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ runner_impl::line_type runner_impl::getline()
# ifdef INK_ENABLE_STL
line_type result{_output.get()};
# elif defined(INK_ENABLE_UNREAL)
line_type result{ANSI_TO_TCHAR(_output.get_alloc(_globals->strings(), _globals->lists()))};
line_type result{UTF8_TO_TCHAR(_output.get_alloc(_globals->strings(), _globals->lists()))};
# else
# error unsupported constraints for getline
# endif
Expand Down
23 changes: 6 additions & 17 deletions unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,21 @@

#include "ink/choice.h"

FString UInkChoice::GetText() const
{
return data->text();
}
FString UInkChoice::GetText() const { return data->text(); }

UInkChoice::UInkChoice() {
tags = NewObject<UTagList>();
}
UInkChoice::UInkChoice() { tags = NewObject<UTagList>(); }

int UInkChoice::GetIndex() const
{
return data->index();
}
int UInkChoice::GetIndex() const { return data->index(); }

const UTagList* UInkChoice::GetTags() const
{
return tags;
}
const UTagList* UInkChoice::GetTags() const { return tags; }

void UInkChoice::Initialize(const ink::runtime::choice* c)
{
data = c;
if (c->has_tags()) {
TArray<FString> fstring_tags{};
for(unsigned i = 0; i < c->num_tags(); ++i) {
fstring_tags.Add(FString(ANSI_TO_TCHAR(c->get_tag(i))));
for (unsigned i = 0; i < c->num_tags(); ++i) {
fstring_tags.Add(FString(UTF8_TO_TCHAR(c->get_tag(i))));
}
tags->Initialize(fstring_tags);
}
Expand Down
12 changes: 6 additions & 6 deletions unreal/inkcpp/Source/inkcpp/Private/InkList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

bool UInkList::ContainsFlag(const FString& flag_name) const
{
return list_data->contains(TCHAR_TO_ANSI(*flag_name));
return list_data->contains(TCHAR_TO_UTF8(*flag_name));
}

bool UInkList::ContainsEnum(const UEnum* Enum, const uint8& value) const
Expand All @@ -25,7 +25,7 @@ bool UInkList::ContainsEnum(const UEnum* Enum, const uint8& value) const
return false;
}

return list_data->contains(TCHAR_TO_ANSI(*Enum->GetDisplayNameTextByValue(value).ToString()));
return list_data->contains(TCHAR_TO_UTF8(*Enum->GetDisplayNameTextByValue(value).ToString()));
}

TArray<uint8> UInkList::ElementsOf(const UEnum* Enum) const
Expand All @@ -38,10 +38,10 @@ TArray<uint8> UInkList::ElementsOf(const UEnum* Enum) const
FString enumName = Enum->GetFName().ToString();

int num = Enum->NumEnums();
std::string str(TCHAR_TO_ANSI(*enumName));
std::string str(TCHAR_TO_UTF8(*enumName));
for (auto itr = list_data->begin(str.c_str()); itr != list_data->end(); ++itr) {
bool hit = false;
const FString flag(ANSI_TO_TCHAR((*itr).flag_name));
const FString flag(UTF8_TO_TCHAR((*itr).flag_name));
for (int i = 0; i < num; ++i) {
FString enumStr = Enum->GetDisplayNameTextByIndex(i).ToString();
if (enumStr.EndsWith(flag)) {
Expand All @@ -65,7 +65,7 @@ TArray<FString> UInkList::ElementsOfAsString(const UEnum* Enum) const
TArray<FString> ret;

FString EnumName = Enum->GetFName().ToString();
for (auto itr = list_data->begin(TCHAR_TO_ANSI(*EnumName)); itr != list_data->end(); ++itr) {
for (auto itr = list_data->begin(TCHAR_TO_UTF8(*EnumName)); itr != list_data->end(); ++itr) {
ret.Add(FString((*itr).flag_name));
}
return ret;
Expand All @@ -85,5 +85,5 @@ TArray<FListFlag> UInkList::Elements() const

bool UInkList::ContainsList(const FString& name) const
{
return list_data->begin(TCHAR_TO_ANSI(*name)) != list_data->end();
return list_data->begin(TCHAR_TO_UTF8(*name)) != list_data->end();
}
Loading
Loading