summaryrefslogtreecommitdiff
path: root/plugins/workflow.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-31 10:17:27 -0600
committerQuietust2012-01-31 10:17:27 -0600
commita82f4c913803038d20b4c92e65b53f9fea9555dc (patch)
tree6a66fa8e5fa237fad45e0aa9f7ebba2b2e7cf028 /plugins/workflow.cpp
parent70454842aebb8ec70898c6c684b0987dbae1ca2a (diff)
downloaddfhack-a82f4c913803038d20b4c92e65b53f9fea9555dc.tar.gz
dfhack-a82f4c913803038d20b4c92e65b53f9fea9555dc.tar.bz2
dfhack-a82f4c913803038d20b4c92e65b53f9fea9555dc.tar.xz
Cleanup code to get rid of MSVC warning C4482
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 0213e460..947d6c5d 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() == 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() == 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() == general_ref_type::CONTAINS_UNIT)
return true;
- else if (ref->getType() == df::general_ref_type::UNIT_HOLDER)
+ else if (ref->getType() == 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() == general_ref_type::CONTAINED_IN_ITEM)
{
df::item *obj = ref->getItem();
if (!obj)