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

Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

develop
lethosor 2015-09-07 21:26:14 -04:00
parent 804abcf9a8 973a8dc485
commit b2b1a6e844
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,10 +179,10 @@ message UnitDefinition
optional int32 pos_z = 5; optional int32 pos_z = 5;
optional MatPair race = 6; optional MatPair race = 6;
optional ColorDefinition profession_color = 7; optional ColorDefinition profession_color = 7;
optional uint32 flags1 = 8; optional uint32 flags1 = 8;
optional uint32 flags2 = 9; optional uint32 flags2 = 9;
optional uint32 flags3 = 10; optional uint32 flags3 = 10;
optional bool is_soldier = 11;
} }
message UnitList message UnitList

1
plugins/remotefortressreader.cpp
Unescape Escape View File

@ -965,6 +965,7 @@ static command_result GetUnitList(color_ostream &stream, const EmptyMessage *in,
send_unit->set_flags1(unit->flags1.whole); send_unit->set_flags1(unit->flags1.whole);
send_unit->set_flags2(unit->flags2.whole); send_unit->set_flags2(unit->flags2.whole);
send_unit->set_flags3(unit->flags3.whole); send_unit->set_flags3(unit->flags3.whole);
send_unit->set_is_soldier(ENUM_ATTR(profession, military, unit->profession));
} }
return CR_OK; return CR_OK;
} }