diff options
| author | Alexander Gavrilov | 2012-04-05 18:10:16 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-04-05 18:10:16 +0400 |
| commit | 28a741082f8b0981806b8a63589279627bd8e39e (patch) | |
| tree | 1377cede68f392e756dcfa16bc76edc0b59d8714 /library/RemoteTools.cpp | |
| parent | 59f411e4016405ebef0a928c002098586be77ebb (diff) | |
| download | dfhack-28a741082f8b0981806b8a63589279627bd8e39e.tar.gz dfhack-28a741082f8b0981806b8a63589279627bd8e39e.tar.bz2 dfhack-28a741082f8b0981806b8a63589279627bd8e39e.tar.xz | |
Encode & decode names in utf-8 for transfer in remote messages.
That's the encoding required by the protobuf spec.
Diffstat (limited to 'library/RemoteTools.cpp')
| -rw-r--r-- | library/RemoteTools.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp index 229e5a70..01c11064 100644 --- a/library/RemoteTools.cpp +++ b/library/RemoteTools.cpp @@ -221,30 +221,30 @@ void DFHack::describeMaterial(BasicMaterialInfo *info, const MaterialInfo &mat, void DFHack::describeName(NameInfo *info, df::language_name *name) { if (!name->first_name.empty()) - info->set_first_name(name->first_name); + info->set_first_name(DF2UTF(name->first_name)); if (!name->nickname.empty()) - info->set_nickname(name->nickname); + info->set_nickname(DF2UTF(name->nickname)); if (name->language >= 0) info->set_language_id(name->language); std::string lname = Translation::TranslateName(name, false, true); if (!lname.empty()) - info->set_last_name(lname); + info->set_last_name(DF2UTF(lname)); lname = Translation::TranslateName(name, true, true); if (!lname.empty()) - info->set_english_name(lname); + info->set_english_name(DF2UTF(lname)); } void DFHack::describeNameTriple(NameTriple *info, const std::string &name, const std::string &plural, const std::string &adj) { - info->set_normal(name); + info->set_normal(DF2UTF(name)); if (!plural.empty() && plural != name) - info->set_plural(plural); + info->set_plural(DF2UTF(plural)); if (!adj.empty() && adj != name) - info->set_adjective(adj); + info->set_adjective(DF2UTF(adj)); } void DFHack::describeUnit(BasicUnitInfo *info, df::unit *unit, |
