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

Merge branch 'master' of git://github.com/ab9rf/dfhack

develop
Robert Heinrich 2012-04-16 17:37:09 +02:00
parent 3b68faa1be 43e4814147
commit 70ebd26e6c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/workflow.cpp
Unescape Escape View File

@ -808,7 +808,7 @@ static void compute_custom_job(ProtectedJob *pj, df::job *job)
using namespace df::enums::reaction_product_item_flags; using namespace df::enums::reaction_product_item_flags;
VIRTUAL_CAST_VAR(prod, df::reaction_product_itemst, r->products[i]); VIRTUAL_CAST_VAR(prod, df::reaction_product_itemst, r->products[i]);
if (!prod || prod->item_type < 0) if (!prod || (prod->item_type < 0 && !prod->flags.is_set(CRAFTS)))
continue; continue;
MaterialInfo mat(prod); MaterialInfo mat(prod);
@ -854,7 +854,7 @@ static void compute_custom_job(ProtectedJob *pj, df::job *job)
} }
link_job_constraint(pj, prod->item_type, prod->item_subtype, link_job_constraint(pj, prod->item_type, prod->item_subtype,
mat_mask, mat.type, mat.index); mat_mask, mat.type, mat.index, prod->flags.is_set(CRAFTS));
} }
} }