summaryrefslogtreecommitdiff
path: root/library/RemoteTools.cpp
diff options
context:
space:
mode:
authorWill Rogers2012-04-03 14:22:46 -0400
committerWill Rogers2012-04-03 14:22:46 -0400
commit7e896277ec4076c0c441d9b3cda766493eb82d15 (patch)
treecc344923f55357e835c05fd9f87b978bda14f053 /library/RemoteTools.cpp
parent59d7b6faabdfbf662ca8a71b66b3893542d0ec45 (diff)
downloaddfhack-7e896277ec4076c0c441d9b3cda766493eb82d15.tar.gz
dfhack-7e896277ec4076c0c441d9b3cda766493eb82d15.tar.bz2
dfhack-7e896277ec4076c0c441d9b3cda766493eb82d15.tar.xz
Don't export describeJobSkills.
Diffstat (limited to 'library/RemoteTools.cpp')
-rw-r--r--library/RemoteTools.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/library/RemoteTools.cpp b/library/RemoteTools.cpp
index 4ff7ce69..5103b756 100644
--- a/library/RemoteTools.cpp
+++ b/library/RemoteTools.cpp
@@ -338,21 +338,6 @@ void DFHack::describeUnit(BasicUnitInfo *info, df::unit *unit,
info->add_burrows(unit->burrows[i]);
}
-void DFHack::describeJobSkills(RepeatedPtrField<JobSkillInfo> *pf)
-{
- FOR_ENUM_ITEMS(job_skill, skill)
- {
- auto item = pf->Add();
-
- item->set_id(skill);
- item->set_caption(ENUM_ATTR_STR(job_skill, caption, skill));
- item->set_caption_noun(ENUM_ATTR_STR(job_skill, caption_noun, skill));
- item->set_profession(ENUM_ATTR(job_skill, profession, skill));
- item->set_labor(ENUM_ATTR(job_skill, labor, skill));
- item->set_type(ENUM_ATTR(job_skill, type, skill));
- }
-}
-
static command_result GetVersion(color_ostream &stream,
const EmptyMessage *, StringMessage *out)
{
@@ -462,7 +447,20 @@ static command_result ListEnums(color_ostream &stream,
static command_result ListJobSkills(color_ostream &stream, const EmptyMessage *, ListJobSkillsOut *out)
{
- describeJobSkills(out->mutable_value());
+ auto pf = out->mutable_value();
+
+ FOR_ENUM_ITEMS(job_skill, skill)
+ {
+ auto item = pf->Add();
+
+ item->set_id(skill);
+ item->set_caption(ENUM_ATTR_STR(job_skill, caption, skill));
+ item->set_caption_noun(ENUM_ATTR_STR(job_skill, caption_noun, skill));
+ item->set_profession(ENUM_ATTR(job_skill, profession, skill));
+ item->set_labor(ENUM_ATTR(job_skill, labor, skill));
+ item->set_type(ENUM_ATTR(job_skill, type, skill));
+ }
+
return CR_OK;
}