Skip to content

RemoteFortressReader: send creature/caste names and descriptions as UTF-8 in GetPartialCreatureRaws #6021

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
dwmuller wants to merge 1 commit into
base: develop
Choose a base branch
from
+16 −15
Open

RemoteFortressReader: send creature/caste names and descriptions as UTF-8 in GetPartialCreatureRaws #6021

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
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 15 additions & 15 deletions plugins/remotefortressreader/remotefortressreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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++)
Expand Down Expand Up @@ -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);
}

Expand Down