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

Merge remote-tracking branch 'origin/remote_control' into remote_control

develop
Japa 2018-02-03 11:10:30 +05:30
parent 0f43c07334 8665600574
commit c8747a772b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/proto/RemoteFortressReader.proto
Unescape Escape View File

@ -882,6 +882,7 @@ message Status
message ShapeDescriptior message ShapeDescriptior
{ {
optional string id = 1; optional string id = 1;
optional int32 tile = 2;
} }
message Language message Language
@ -936,4 +937,5 @@ message ArtImageElement
message ArtImage message ArtImage
{ {
repeated ArtImageElement elements = 1; repeated ArtImageElement elements = 1;
optional MatPair id = 2;
} }

3
plugins/remotefortressreader/item_reader.cpp
Unescape Escape View File

@ -49,6 +49,9 @@ using namespace df::global;
void CopyImage(const df::art_image * image, ArtImage * netImage) void CopyImage(const df::art_image * image, ArtImage * netImage)
{ {
auto id = netImage->mutable_id();
id->set_mat_type(image->id);
id->set_mat_index(image->subid);
for (int i = 0; i < image->elements.size(); i++) for (int i = 0; i < image->elements.size(); i++)
{ {
auto element = image->elements[i]; auto element = image->elements[i];

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

@ -53,8 +53,6 @@
#include "df/creature_raw.h" #include "df/creature_raw.h"
#include "df/creature_raw.h" #include "df/creature_raw.h"
#include "df/descriptor_color.h" #include "df/descriptor_color.h"
#include "df/descriptor_color.h"
#include "df/descriptor_pattern.h"
#include "df/descriptor_pattern.h" #include "df/descriptor_pattern.h"
#include "df/descriptor_shape.h" #include "df/descriptor_shape.h"
#include "df/dfhack_material_category.h" #include "df/dfhack_material_category.h"
@ -2919,6 +2917,7 @@ static command_result GetLanguage(color_ostream & stream, const EmptyMessage * i
auto shape = world->raws.language.shapes[i]; auto shape = world->raws.language.shapes[i];
auto netShape = out->add_shapes(); auto netShape = out->add_shapes();
netShape->set_id(shape->id); netShape->set_id(shape->id);
netShape->set_tile(shape->tile);
} }
return CR_OK; return CR_OK;
} }