update structures

BenLubar · BenLubar · commit e35692579593 · 2020-03-02T23:12:03.000-06:00
diff --git a/library/Types.cpp b/library/Types.cpp
@@ -127,7 +127,7 @@ bool DFHack::removeRef(std::vector<df::specific_ref*> &vec, df::specific_ref_typ
     for (int i = vec.size()-1; i >= 0; i--)
     {
         df::specific_ref *ref = vec[i];
-        if (ref->type != type || ref->object != ptr)
+        if (ref->type != type || ref->data.object != ptr)
             continue;
 
         vector_erase_at(vec, i);
diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
@@ -658,7 +658,7 @@ df::coord Items::getPosition(df::item *item)
             switch (ref->type)
             {
             case specific_ref_type::VERMIN_ESCAPED_PET:
-                return ref->vermin->pos;
+                return ref->data.VERMIN_ESCAPED_PET->pos;
 
             default:
                 break;
diff --git a/library/modules/Job.cpp b/library/modules/Job.cpp
@@ -311,7 +311,7 @@ void DFHack::Job::disconnectJobItem(df::job *job, df::job_item_ref *ref) {
         auto ref = item->specific_refs[refIndex];
 
         if (ref->type == df::specific_ref_type::JOB) {
-            if (ref->job == job) {
+            if (ref->data.JOB == job) {
                 vector_erase_at(item->specific_refs, refIndex);
                 delete ref;
             } else {
@@ -579,7 +579,7 @@ bool DFHack::Job::attachJobItem(df::job *job, df::item *item,
 
     auto item_link = new df::specific_ref();
     item_link->type = specific_ref_type::JOB;
-    item_link->job = job;
+    item_link->data.JOB = job;
     item->specific_refs.push_back(item_link);
 
     auto job_link = new df::job_item_ref();
diff --git a/library/xml b/library/xml
@@ -1 +1 @@
-Subproject commit 5653a57e0978a78c1f1ef125b63359fefa7660f2
+Subproject commit 61eed9280adfb51dde777c9e8f8549a4d72e868b
diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp
@@ -179,8 +179,8 @@ static map<df::item *, bool> items_in_cages;
 static df::job *get_item_job(df::item *item)
 {
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (ref && ref->job)
-        return ref->job;
+    if (ref && ref->data.JOB)
+        return ref->data.JOB;
 
     return nullptr;
 }
@@ -1008,12 +1008,12 @@ class ViewscreenStocks : public dfhack_viewscreen
             if (item->flags.bits.in_job)
             {
                 auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-                if (ref && ref->job)
+                if (ref && ref->data.JOB)
                 {
-                    if (ref->job->job_type == job_type::Eat || ref->job->job_type == job_type::Drink)
+                    if (ref->data.JOB->job_type == job_type::Eat || ref->data.JOB->job_type == job_type::Drink)
                         return pos;
 
-                    auto unit = Job::getWorker(ref->job);
+                    auto unit = Job::getWorker(ref->data.JOB);
                     if (unit)
                         return unit->pos;
                 }
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
@@ -1151,10 +1151,10 @@ static bool itemInRealJob(df::item *item)
         return false;
 
     auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);
-    if (!ref || !ref->job)
+    if (!ref || !ref->data.JOB)
         return true;
 
-    return ENUM_ATTR(job_type, type, ref->job->job_type)
+    return ENUM_ATTR(job_type, type, ref->data.JOB->job_type)
                != job_type_class::Hauling;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ bool DFHack::removeRef(std::vector<df::specific_ref*> &vec, df::specific_ref_typ`
`127`	`127`	`for (int i = vec.size()-1; i >= 0; i--)`
`128`	`128`	`{`
`129`	`129`	`df::specific_ref *ref = vec[i];`
`130`		`- if (ref->type != type \|\| ref->object != ptr)`
	`130`	`+ if (ref->type != type \|\| ref->data.object != ptr)`
`131`	`131`	`continue;`
`132`	`132`
`133`	`133`	`vector_erase_at(vec, i);`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ df::coord Items::getPosition(df::item *item)`
`658`	`658`	`switch (ref->type)`
`659`	`659`	`{`
`660`	`660`	`case specific_ref_type::VERMIN_ESCAPED_PET:`
`661`		`- return ref->vermin->pos;`
	`661`	`+ return ref->data.VERMIN_ESCAPED_PET->pos;`
`662`	`662`
`663`	`663`	`default:`
`664`	`664`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,8 @@ static map<df::item *, bool> items_in_cages;`
`179`	`179`	`static df::job get_item_job(df::item item)`
`180`	`180`	`{`
`181`	`181`	`auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);`
`182`		`- if (ref && ref->job)`
`183`		`- return ref->job;`
	`182`	`+ if (ref && ref->data.JOB)`
	`183`	`+ return ref->data.JOB;`
`184`	`184`
`185`	`185`	`return nullptr;`
`186`	`186`	`}`
`@@ -1008,12 +1008,12 @@ class ViewscreenStocks : public dfhack_viewscreen`
`1008`	`1008`	`if (item->flags.bits.in_job)`
`1009`	`1009`	`{`
`1010`	`1010`	`auto ref = Items::getSpecificRef(item, specific_ref_type::JOB);`
`1011`		`- if (ref && ref->job)`
	`1011`	`+ if (ref && ref->data.JOB)`
`1012`	`1012`	`{`
`1013`		`- if (ref->job->job_type == job_type::Eat \|\| ref->job->job_type == job_type::Drink)`
	`1013`	`+ if (ref->data.JOB->job_type == job_type::Eat \|\| ref->data.JOB->job_type == job_type::Drink)`
`1014`	`1014`	`return pos;`
`1015`	`1015`
`1016`		`- auto unit = Job::getWorker(ref->job);`
	`1016`	`+ auto unit = Job::getWorker(ref->data.JOB);`
`1017`	`1017`	`if (unit)`
`1018`	`1018`	`return unit->pos;`
`1019`	`1019`	`}`