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

Send statue images.

develop
Japa 2018-01-25 07:53:19 +05:30
parent ee7ad348f0
commit 68324dfe0b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -277,6 +277,7 @@ message Item
optional float velocity_z = 15; optional float velocity_z = 15;
optional int32 volume = 16; optional int32 volume = 16;
repeated ItemImprovement improvements = 17; repeated ItemImprovement improvements = 17;
optional ArtImage image = 18;
} }
message MapBlock message MapBlock

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

@ -14,9 +14,10 @@
#include "df/item_type.h" #include "df/item_type.h"
#include "df/item_constructed.h" #include "df/item_constructed.h"
#include "df/item_gemst.h" #include "df/item_gemst.h"
#include "df/item_smallgemst.h"
#include "df/item_statuest.h"
#include "df/item_threadst.h" #include "df/item_threadst.h"
#include "df/item_toolst.h" #include "df/item_toolst.h"
#include "df/item_smallgemst.h"
#include "df/itemimprovement.h" #include "df/itemimprovement.h"
#include "df/itemimprovement_art_imagest.h" #include "df/itemimprovement_art_imagest.h"
#include "df/itemimprovement_bandsst.h" #include "df/itemimprovement_bandsst.h"
@ -186,7 +187,11 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
case df::enums::item_type::COFFIN: case df::enums::item_type::COFFIN:
break; break;
case df::enums::item_type::STATUE: case df::enums::item_type::STATUE:
{
VIRTUAL_CAST_VAR(statue, df::item_statuest, DfItem);
CopyImage(statue->image, NetItem->mutable_image());
break; break;
}
case df::enums::item_type::CORPSE: case df::enums::item_type::CORPSE:
break; break;
case df::enums::item_type::WEAPON: case df::enums::item_type::WEAPON:
@ -384,9 +389,11 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
switch (impType) switch (impType)
{ {
case df::enums::improvement_type::ART_IMAGE: case df::enums::improvement_type::ART_IMAGE:
{
VIRTUAL_CAST_VAR(artImage, df::itemimprovement_art_imagest, improvement); VIRTUAL_CAST_VAR(artImage, df::itemimprovement_art_imagest, improvement);
CopyImage(artImage->image, netImp->mutable_image()); CopyImage(artImage->image, netImp->mutable_image());
break; break;
}
case df::enums::improvement_type::COVERED: case df::enums::improvement_type::COVERED:
{ {
VIRTUAL_CAST_VAR(covered, df::itemimprovement_coveredst, improvement); VIRTUAL_CAST_VAR(covered, df::itemimprovement_coveredst, improvement);