From efe4926df0f20a8b22a4ef7ef0d758f001684c2f Mon Sep 17 00:00:00 2001 From: JapaMala Date: Thu, 2 Aug 2018 21:50:29 +0530 Subject: [PATCH] Send equipped item bodypart attachments over RFR --- library/xml | 2 +- plugins/proto/RemoteFortressReader.proto | 1 + plugins/remotefortressreader/remotefortressreader.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 579283113..de83a453d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 57928311390bb67fe0cd5deec14e2d4621b13a58 +Subproject commit de83a453d7e55aa48ffc92c8f4c147b1a1acd525 diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto index b60dcb996..b1ae33cc0 100644 --- a/plugins/proto/RemoteFortressReader.proto +++ b/plugins/proto/RemoteFortressReader.proto @@ -426,6 +426,7 @@ message InventoryItem { optional InventoryMode mode = 1; optional Item item = 2; + optional int32 body_part_id = 3; } message UnitDefinition diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index f7d0b9b50..084b4dbbb 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -1807,6 +1807,7 @@ static command_result GetUnitListInside(color_ostream &stream, const BlockReques auto inventory_item = unit->inventory[j]; auto sent_item = send_unit->add_inventory(); sent_item->set_mode((InventoryMode)inventory_item->mode); + sent_item->set_body_part_id(inventory_item->body_part_id); CopyItem(sent_item->mutable_item(), inventory_item->item); }