From a69120f3042aebb21ae6a7caa9ad60b5c9c9b477 Mon Sep 17 00:00:00 2001 From: Dan Muller Date: Tue, 20 Oct 2026 10:38:23 -0400 Subject: [PATCH] RemoteFortressReader: convert creature/caste names and descriptions to UTF-8 in GetPartialCreatureRaws Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- docs/changelog.txt | 1 + .../remotefortressreader.cpp | 30 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index c2470dbe87..972d1c6527 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -60,6 +60,7 @@ Template for new versions: ## New Features ## Fixes +- ``RemoteFortressReader``: ensured creature and caste names and caste descriptions in ``GetCreatureRaws``/``GetPartialCreatureRaws`` are transmitted in UTF-8 instead of CP437 ## Misc Improvements diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index 9a8f034c5b..3145ca1add 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -2626,15 +2626,15 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe send_creature->set_index(i); send_creature->set_creature_id(orig_creature->creature_id); - send_creature->add_name(orig_creature->name[0]); - send_creature->add_name(orig_creature->name[1]); - send_creature->add_name(orig_creature->name[2]); + send_creature->add_name(DF2UTF(orig_creature->name[0])); + send_creature->add_name(DF2UTF(orig_creature->name[1])); + send_creature->add_name(DF2UTF(orig_creature->name[2])); - send_creature->add_general_baby_name(orig_creature->general_baby_name[0]); - send_creature->add_general_baby_name(orig_creature->general_baby_name[1]); + send_creature->add_general_baby_name(DF2UTF(orig_creature->general_baby_name[0])); + send_creature->add_general_baby_name(DF2UTF(orig_creature->general_baby_name[1])); - send_creature->add_general_child_name(orig_creature->general_child_name[0]); - send_creature->add_general_child_name(orig_creature->general_child_name[1]); + send_creature->add_general_child_name(DF2UTF(orig_creature->general_child_name[0])); + send_creature->add_general_child_name(DF2UTF(orig_creature->general_child_name[1])); send_creature->set_creature_tile(orig_creature->creature_tile); send_creature->set_creature_soldier_tile(orig_creature->creature_soldier_tile); @@ -2654,15 +2654,15 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe send_caste->set_caste_id(orig_caste->caste_id); - send_caste->add_caste_name(orig_caste->caste_name[0]); - send_caste->add_caste_name(orig_caste->caste_name[1]); - send_caste->add_caste_name(orig_caste->caste_name[2]); + send_caste->add_caste_name(DF2UTF(orig_caste->caste_name[0])); + send_caste->add_caste_name(DF2UTF(orig_caste->caste_name[1])); + send_caste->add_caste_name(DF2UTF(orig_caste->caste_name[2])); - send_caste->add_baby_name(orig_caste->baby_name[0]); - send_caste->add_baby_name(orig_caste->baby_name[1]); + send_caste->add_baby_name(DF2UTF(orig_caste->baby_name[0])); + send_caste->add_baby_name(DF2UTF(orig_caste->baby_name[1])); - send_caste->add_child_name(orig_caste->child_name[0]); - send_caste->add_child_name(orig_caste->child_name[1]); + send_caste->add_child_name(DF2UTF(orig_caste->child_name[0])); + send_caste->add_child_name(DF2UTF(orig_caste->child_name[1])); send_caste->set_gender(orig_caste->sex); for (size_t partIndex = 0; partIndex < orig_caste->body_info.body_parts.size(); partIndex++) @@ -2781,7 +2781,7 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe } } - send_caste->set_description(orig_caste->description); + send_caste->set_description(DF2UTF(orig_caste->description)); send_caste->set_adult_size(orig_caste->misc.adult_size); }