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

Fix bug with non-repeating jobs getting protected

develop
Anuradha Dissanayake 2012-11-10 03:47:15 +13:00
parent 69bb6a5b3b
commit 0222b93bb0
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/workflow.cpp
Unescape Escape View File

@ -640,7 +640,7 @@ static string get_constraint_material(ItemConstraint *cv)
text.append(" "); text.append(" ");
} }
text.append(bitfield_to_string(cv->mat_mask)); text.append(bitfield_to_string(cv->mat_mask, ","));
return text; return text;
} }
@ -2904,17 +2904,26 @@ namespace wf_ui
Gui::getSelectedWorkshopJob(console_out, true)); Gui::getSelectedWorkshopJob(console_out, true));
} }
ProtectedJob *get_protected_job(int32_t id)
{
ProtectedJob *pj = get_known(id);
if (!pj && job->flags.bits.repeat)
{
pj = add_known_job(job);
compute_job_outputs(console_out, pj);
}
return pj;
}
bool handleInput(set<df::interface_key> *input) bool handleInput(set<df::interface_key> *input)
{ {
bool key_processed = true; bool key_processed = true;
if (checkJobSelection()) if (checkJobSelection())
{ {
ProtectedJob *pj = get_known(job->id); ProtectedJob *pj = get_protected_job(job->id);
if (!pj)
return false;
ItemConstraint *cv = NULL; ItemConstraint *cv = NULL;
if (pj->constraints.size() > 0) if (pj && pj->constraints.size() > 0)
cv = pj->constraints[0]; cv = pj->constraints[0];
if (!dialog.feed(input, cv, pj)) if (!dialog.feed(input, cv, pj))
@ -2924,13 +2933,19 @@ namespace wf_ui
if (!cv) if (!cv)
{ {
// Add tracking // Add tracking
if (!pj)
pj = add_known_job(job);
compute_job_outputs(console_out, pj, true); compute_job_outputs(console_out, pj, true);
if (pj->constraints.size() > 0) if (pj->constraints.size() > 0)
{ {
cv = pj->constraints[0]; cv = pj->constraints[0];
cv->setGoalByCount(false); if (cv->goalCount() == -1)
cv->setGoalCount(10); {
cv->setGoalGap(1); cv->setGoalByCount(false);
cv->setGoalCount(10);
cv->setGoalGap(1);
}
job->flags.bits.repeat = true; job->flags.bits.repeat = true;
} }
else else
@ -2971,18 +2986,13 @@ namespace wf_ui
INTERPOSE_NEXT(render)(); INTERPOSE_NEXT(render)();
if (checkJobSelection()) if (checkJobSelection())
{ {
ProtectedJob *pj = get_known(job->id);
if (!pj)
{
pj = add_known_job(job);
compute_job_outputs(console_out, pj);
}
ItemConstraint *cv = NULL; ItemConstraint *cv = NULL;
if (pj->constraints.size() > 0) ProtectedJob *pj = get_protected_job(job->id);
if (pj && pj->constraints.size() > 0)
{ {
cv = pj->constraints[0]; cv = pj->constraints[0];
} }
dialog.render(cv); dialog.render(cv);
if (cv) if (cv)
++dialog.y; ++dialog.y;