From 78d6b921270f55170a8a1ded4a97691cd3d3c4b9 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 12 Dec 2015 11:17:00 -0500 Subject: [PATCH] Change strangemood permitted skill checks to job checks permitted_skills was removed in 0.42 (dfhack/df-structures@6e2e8731) --- library/xml | 2 +- plugins/strangemood.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/xml b/library/xml index 309c801b6..6e2e8731d 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 309c801b63825f955eff628a35ca09ba46fff065 +Subproject commit 6e2e8731d2c10a4a5394046ae48cc0cd16e9a049 diff --git a/plugins/strangemood.cpp b/plugins/strangemood.cpp index 8ad245c7c..382c03358 100644 --- a/plugins/strangemood.cpp +++ b/plugins/strangemood.cpp @@ -104,11 +104,11 @@ df::job_skill getMoodSkill (df::unit *unit) } if (!skills.size() && civ) { - if (civ->entity_raw->jobs.permitted_skill[job_skill::WOODCRAFT]) + if (civ->entity_raw->jobs.permitted_job[profession::WOODCRAFTER]) skills.push_back(job_skill::WOODCRAFT); - if (civ->entity_raw->jobs.permitted_skill[job_skill::STONECRAFT]) + if (civ->entity_raw->jobs.permitted_job[profession::STONECRAFTER]) skills.push_back(job_skill::STONECRAFT); - if (civ->entity_raw->jobs.permitted_skill[job_skill::BONECARVE]) + if (civ->entity_raw->jobs.permitted_job[profession::BONE_CARVER]) skills.push_back(job_skill::BONECARVE); } if (!skills.size())