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

Ensure that the correct job posting is kept (if there is one)

develop
lethosor 2015-11-25 23:35:19 -05:00
parent 428a0a4cfe
commit 2700b01765
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/workflow.cpp
Unescape Escape View File

@ -436,19 +436,13 @@ static int fix_job_postings (color_ostream *out, bool dry_run)
df::job *job = link->item; df::job *job = link->item;
if (job) if (job)
{ {
bool needs_posting = (job->posting_index >= 0); for (size_t i = 0; i < world->job_postings.size(); ++i)
bool found_posting = false;
for (auto it = world->job_postings.begin(); it != world->job_postings.end(); ++it)
{ {
df::world::T_job_postings *posting = *it; df::world::T_job_postings *posting = world->job_postings[i];
if (posting->job == job && !posting->flags.bits.dead) if (posting->job == job && i != job->posting_index)
{
if (!found_posting && needs_posting)
found_posting = true;
else
{ {
++count; ++count;
if (*out) if (out)
*out << "Found extra job posting: Job " << job->id << ": " *out << "Found extra job posting: Job " << job->id << ": "
<< Job::getName(job) << endl; << Job::getName(job) << endl;
if (!dry_run) if (!dry_run)
@ -456,7 +450,6 @@ static int fix_job_postings (color_ostream *out, bool dry_run)
} }
} }
} }
}
link = link->next; link = link->next;
} }
return count; return count;