MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

encode transmitted names in utf-8

develop
Myk Taylor 2023-05-19 19:41:02 -07:00
parent d664b4a5a7
commit 3729d7daa4
No known key found for this signature in database
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- DFHack screen backgrounds now use appropriate tiles in DF Classic - DFHack screen backgrounds now use appropriate tiles in DF Classic
- RemoteServer: fix crash on malformed json in ``dfhack-config/remote-server.json`` - RemoteServer: fix crash on malformed json in ``dfhack-config/remote-server.json``
- `autolabor`: work detail override warning now only appears on the work details screen - `autolabor`: work detail override warning now only appears on the work details screen
- `RemoteFortressReader`: ensured names are transmitted in UTF-8 instead of CP437
## Misc Improvements ## Misc Improvements
- `autodump`: no longer checks for a keyboard cursor before executing, so ``autodump destroy`` (which doesn't require a cursor) can still function - `autodump`: no longer checks for a keyboard cursor before executing, so ``autodump destroy`` (which doesn't require a cursor) can still function

34
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -808,8 +808,6 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
return CR_OK; return CR_OK;
} }
df::world_raws *raws = &world->raws; df::world_raws *raws = &world->raws;
// df::world_history *history = &world->history; // df::world_history *history = &world->history;
MaterialInfo mat; MaterialInfo mat;
@ -820,7 +818,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
mat_def->mutable_mat_pair()->set_mat_type(0); mat_def->mutable_mat_pair()->set_mat_type(0);
mat_def->mutable_mat_pair()->set_mat_index(i); mat_def->mutable_mat_pair()->set_mat_index(i);
mat_def->set_id(mat.getToken()); mat_def->set_id(mat.getToken());
mat_def->set_name(mat.toString()); //find the name at cave temperature; mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
if (size_t(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)]) < raws->descriptors.colors.size()) if (size_t(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)]) < raws->descriptors.colors.size())
{ {
ConvertDFColorDescriptor(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)], mat_def->mutable_state_color()); ConvertDFColorDescriptor(raws->inorganics[i]->material.state_color[GetState(&raws->inorganics[i]->material)], mat_def->mutable_state_color());
@ -838,7 +836,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
mat_def->mutable_mat_pair()->set_mat_type(i); mat_def->mutable_mat_pair()->set_mat_type(i);
mat_def->mutable_mat_pair()->set_mat_index(j); mat_def->mutable_mat_pair()->set_mat_index(j);
mat_def->set_id(mat.getToken()); mat_def->set_id(mat.getToken());
mat_def->set_name(mat.toString()); //find the name at cave temperature; mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
if (size_t(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])]) < raws->descriptors.colors.size()) if (size_t(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])]) < raws->descriptors.colors.size())
{ {
ConvertDFColorDescriptor(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])], mat_def->mutable_state_color()); ConvertDFColorDescriptor(raws->mat_table.builtin[i]->state_color[GetState(raws->mat_table.builtin[i])], mat_def->mutable_state_color());
@ -855,7 +853,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
mat_def->mutable_mat_pair()->set_mat_type(j + 19); mat_def->mutable_mat_pair()->set_mat_type(j + 19);
mat_def->mutable_mat_pair()->set_mat_index(i); mat_def->mutable_mat_pair()->set_mat_index(i);
mat_def->set_id(mat.getToken()); mat_def->set_id(mat.getToken());
mat_def->set_name(mat.toString()); //find the name at cave temperature; mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
if (size_t(creature->material[j]->state_color[GetState(creature->material[j])]) < raws->descriptors.colors.size()) if (size_t(creature->material[j]->state_color[GetState(creature->material[j])]) < raws->descriptors.colors.size())
{ {
ConvertDFColorDescriptor(creature->material[j]->state_color[GetState(creature->material[j])], mat_def->mutable_state_color()); ConvertDFColorDescriptor(creature->material[j]->state_color[GetState(creature->material[j])], mat_def->mutable_state_color());
@ -872,7 +870,7 @@ static command_result GetMaterialList(color_ostream &stream, const EmptyMessage
mat_def->mutable_mat_pair()->set_mat_type(j + 419); mat_def->mutable_mat_pair()->set_mat_type(j + 419);
mat_def->mutable_mat_pair()->set_mat_index(i); mat_def->mutable_mat_pair()->set_mat_index(i);
mat_def->set_id(mat.getToken()); mat_def->set_id(mat.getToken());
mat_def->set_name(mat.toString()); //find the name at cave temperature; mat_def->set_name(DF2UTF(mat.toString())); //find the name at cave temperature;
if (size_t(plant->material[j]->state_color[GetState(plant->material[j])]) < raws->descriptors.colors.size()) if (size_t(plant->material[j]->state_color[GetState(plant->material[j])]) < raws->descriptors.colors.size())
{ {
ConvertDFColorDescriptor(plant->material[j]->state_color[GetState(plant->material[j])], mat_def->mutable_state_color()); ConvertDFColorDescriptor(plant->material[j]->state_color[GetState(plant->material[j])], mat_def->mutable_state_color());
@ -903,7 +901,7 @@ static command_result GetGrowthList(color_ostream &stream, const EmptyMessage *i
continue; continue;
MaterialDefinition * basePlant = out->add_material_list(); MaterialDefinition * basePlant = out->add_material_list();
basePlant->set_id(pp->id + ":BASE"); basePlant->set_id(pp->id + ":BASE");
basePlant->set_name(pp->name); basePlant->set_name(DF2UTF(pp->name));
basePlant->mutable_mat_pair()->set_mat_type(-1); basePlant->mutable_mat_pair()->set_mat_type(-1);
basePlant->mutable_mat_pair()->set_mat_index(i); basePlant->mutable_mat_pair()->set_mat_index(i);
#if DF_VERSION_INT > 40001 #if DF_VERSION_INT > 40001
@ -916,7 +914,7 @@ static command_result GetGrowthList(color_ostream &stream, const EmptyMessage *i
{ {
MaterialDefinition * out_growth = out->add_material_list(); MaterialDefinition * out_growth = out->add_material_list();
out_growth->set_id(pp->id + ":" + growth->id + +":" + growth_locations[l]); out_growth->set_id(pp->id + ":" + growth->id + +":" + growth_locations[l]);
out_growth->set_name(growth->name); out_growth->set_name(DF2UTF(growth->name));
out_growth->mutable_mat_pair()->set_mat_type(g * 10 + l); out_growth->mutable_mat_pair()->set_mat_type(g * 10 + l);
out_growth->mutable_mat_pair()->set_mat_index(i); out_growth->mutable_mat_pair()->set_mat_index(i);
} }
@ -1951,8 +1949,8 @@ static command_result GetWorldMapCenter(color_ostream &stream, const EmptyMessag
out->set_center_x(pos.x); out->set_center_x(pos.x);
out->set_center_y(pos.y); out->set_center_y(pos.y);
out->set_center_z(pos.z); out->set_center_z(pos.z);
out->set_name(Translation::TranslateName(&(data->name), false)); out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
out->set_name_english(Translation::TranslateName(&(data->name), true)); out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
out->set_cur_year(World::ReadCurrentYear()); out->set_cur_year(World::ReadCurrentYear());
out->set_cur_year_tick(World::ReadCurrentTick()); out->set_cur_year_tick(World::ReadCurrentTick());
return CR_OK; return CR_OK;
@ -1977,8 +1975,8 @@ static command_result GetWorldMap(color_ostream &stream, const EmptyMessage *in,
int height = data->world_height; int height = data->world_height;
out->set_world_width(width); out->set_world_width(width);
out->set_world_height(height); out->set_world_height(height);
out->set_name(Translation::TranslateName(&(data->name), false)); out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
out->set_name_english(Translation::TranslateName(&(data->name), true)); out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
auto poles = data->flip_latitude; auto poles = data->flip_latitude;
#if DF_VERSION_INT > 34011 #if DF_VERSION_INT > 34011
switch (poles) switch (poles)
@ -2126,8 +2124,8 @@ static command_result GetWorldMapNew(color_ostream &stream, const EmptyMessage *
int height = data->world_height; int height = data->world_height;
out->set_world_width(width); out->set_world_width(width);
out->set_world_height(height); out->set_world_height(height);
out->set_name(Translation::TranslateName(&(data->name), false)); out->set_name(DF2UTF(Translation::TranslateName(&(data->name), false)));
out->set_name_english(Translation::TranslateName(&(data->name), true)); out->set_name_english(DF2UTF(Translation::TranslateName(&(data->name), true)));
#if DF_VERSION_INT > 34011 #if DF_VERSION_INT > 34011
auto poles = data->flip_latitude; auto poles = data->flip_latitude;
switch (poles) switch (poles)
@ -2797,8 +2795,8 @@ static command_result GetPartialCreatureRaws(color_ostream &stream, const ListRe
auto send_tissue = send_creature->add_tissues(); auto send_tissue = send_creature->add_tissues();
send_tissue->set_id(orig_tissue->id); send_tissue->set_id(orig_tissue->id);
send_tissue->set_name(orig_tissue->tissue_name_singular); send_tissue->set_name(DF2UTF(orig_tissue->tissue_name_singular));
send_tissue->set_subordinate_to_tissue(orig_tissue->subordinate_to_tissue); send_tissue->set_subordinate_to_tissue(DF2UTF(orig_tissue->subordinate_to_tissue));
CopyMat(send_tissue->mutable_material(), orig_tissue->mat_type, orig_tissue->mat_index); CopyMat(send_tissue->mutable_material(), orig_tissue->mat_type, orig_tissue->mat_index);
} }
@ -2831,7 +2829,7 @@ static command_result GetPartialPlantRaws(color_ostream &stream, const ListReque
plant_remote->set_index(i); plant_remote->set_index(i);
plant_remote->set_id(plant_local->id); plant_remote->set_id(plant_local->id);
plant_remote->set_name(plant_local->name); plant_remote->set_name(DF2UTF(plant_local->name));
if (!plant_local->flags.is_set(df::plant_raw_flags::TREE)) if (!plant_local->flags.is_set(df::plant_raw_flags::TREE))
plant_remote->set_tile(plant_local->tiles.shrub_tile); plant_remote->set_tile(plant_local->tiles.shrub_tile);
else else
@ -2843,7 +2841,7 @@ static command_result GetPartialPlantRaws(color_ostream &stream, const ListReque
TreeGrowth * growth_remote = plant_remote->add_growths(); TreeGrowth * growth_remote = plant_remote->add_growths();
growth_remote->set_index(j); growth_remote->set_index(j);
growth_remote->set_id(growth_local->id); growth_remote->set_id(growth_local->id);
growth_remote->set_name(growth_local->name); growth_remote->set_name(DF2UTF(growth_local->name));
for (size_t k = 0; k < growth_local->prints.size(); k++) for (size_t k = 0; k < growth_local->prints.size(); k++)
{ {
df::plant_growth_print* print_local = growth_local->prints[k]; df::plant_growth_print* print_local = growth_local->prints[k];