summaryrefslogtreecommitdiff
path: root/plugins/workflow.cpp
diff options
context:
space:
mode:
authorAlexander Gavrilov2012-01-19 12:07:00 +0400
committerAlexander Gavrilov2012-01-19 12:07:00 +0400
commitd75292acc77b7e23f6aa9d8771aa89592dac0b45 (patch)
tree582bdc61e29bfbd111bb6bf3127a3d7716048933 /plugins/workflow.cpp
parent1aec9649c5c2657be03211733844c751ee023f3e (diff)
parent35ad84c58a0a35732d14cc6e31e457e28546e721 (diff)
downloaddfhack-d75292acc77b7e23f6aa9d8771aa89592dac0b45.tar.gz
dfhack-d75292acc77b7e23f6aa9d8771aa89592dac0b45.tar.bz2
dfhack-d75292acc77b7e23f6aa9d8771aa89592dac0b45.tar.xz
Merge remote-tracking branch 'q-github/master'
Diffstat (limited to 'plugins/workflow.cpp')
-rw-r--r--plugins/workflow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/workflow.cpp b/plugins/workflow.cpp
index 7031f3df..5a2073f1 100644
--- a/plugins/workflow.cpp
+++ b/plugins/workflow.cpp
@@ -984,7 +984,7 @@ static void dryBucket(df::item *item)
for (unsigned i = 0; i < item->itemrefs.size(); i++)
{
df::general_ref *ref = item->itemrefs[i];
- if (ref->getType() == df::general_ref_type::contains_item)
+ if (ref->getType() == df::general_ref_type::CONTAINS_ITEM)
{
df::item *obj = ref->getItem();
@@ -1006,20 +1006,20 @@ static bool itemBusy(df::item *item)
for (unsigned i = 0; i < item->itemrefs.size(); i++)
{
df::general_ref *ref = item->itemrefs[i];
- if (ref->getType() == df::general_ref_type::contains_item)
+ if (ref->getType() == df::general_ref_type::CONTAINS_ITEM)
{
df::item *obj = ref->getItem();
if (obj && !obj->flags.bits.garbage_colect)
return true;
}
- else if (ref->getType() == df::general_ref_type::contains_unit)
+ else if (ref->getType() == df::general_ref_type::CONTAINS_UNIT)
return true;
- else if (ref->getType() == df::general_ref_type::unit_holder)
+ else if (ref->getType() == df::general_ref_type::UNIT_HOLDER)
{
if (!item->flags.bits.in_job)
return true;
}
- else if (ref->getType() == df::general_ref_type::contained_in_item)
+ else if (ref->getType() == df::general_ref_type::CONTAINED_IN_ITEM)
{
df::item *obj = ref->getItem();
if (!obj)