summaryrefslogtreecommitdiff
path: root/plugins/autodump.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-16 20:16:16 -0600
committerQuietust2012-01-16 20:16:16 -0600
commit64b55acf37519450f6feca5cda7d8fba2ee1e491 (patch)
treea135914d93b3472668e63f5ceac9c73bffc46076 /plugins/autodump.cpp
parent97bae19c13eb7f1b9ce651a0eae0a29a0e0b492b (diff)
downloaddfhack-64b55acf37519450f6feca5cda7d8fba2ee1e491.tar.gz
dfhack-64b55acf37519450f6feca5cda7d8fba2ee1e491.tar.bz2
dfhack-64b55acf37519450f6feca5cda7d8fba2ee1e491.tar.xz
df_item -> df::item, t_itemflags -> df::item_flags
Diffstat (limited to 'plugins/autodump.cpp')
-rw-r--r--plugins/autodump.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/plugins/autodump.cpp b/plugins/autodump.cpp
index 1ad392ed..8c1820f2 100644
--- a/plugins/autodump.cpp
+++ b/plugins/autodump.cpp
@@ -98,7 +98,7 @@ static command_result autodump_main(Core * c, vector <string> & parameters)
DFHack::Items * Items = c->getItems();
DFHack::Maps *Maps = c->getMaps();
- vector <df_item*> p_items;
+ vector <df::item*> p_items;
if(!Items->readItemVector(p_items))
{
c->con.printerr("Can't access the item vector.\n");
@@ -148,7 +148,7 @@ static command_result autodump_main(Core * c, vector <string> & parameters)
// proceed with the dumpification operation
for(std::size_t i=0; i< numItems; i++)
{
- df_item * itm = p_items[i];
+ df::item * itm = p_items[i];
DFCoord pos_item(itm->x, itm->y, itm->z);
// keep track how many items are at places. all items.
@@ -165,22 +165,22 @@ static command_result autodump_main(Core * c, vector <string> & parameters)
// iterator is valid here, we use it later to decrement the pile counter if the item is moved
// only dump the stuff marked for dumping and laying on the ground
- if ( !itm->flags.dump
- || !itm->flags.on_ground
- || itm->flags.construction
- || itm->flags.hidden
- || itm->flags.in_building
- || itm->flags.in_chest
- || itm->flags.in_inventory
- || itm->flags.artifact1
+ if ( !itm->flags.bits.dump
+ || !itm->flags.bits.on_ground
+ || itm->flags.bits.construction
+ || itm->flags.bits.hidden
+ || itm->flags.bits.in_building
+ || itm->flags.bits.in_chest
+ || itm->flags.bits.in_inventory
+ || itm->flags.bits.artifact1
)
continue;
if(!destroy) // move to cursor
{
// Change flags to indicate the dump was completed, as if by super-dwarfs
- itm->flags.dump = false;
- itm->flags.forbid = true;
+ itm->flags.bits.dump = false;
+ itm->flags.bits.forbid = true;
// Don't move items if they're already at the cursor
if (pos_cursor == pos_item)
@@ -221,11 +221,11 @@ static command_result autodump_main(Core * c, vector <string> & parameters)
if (here && pos_item != pos_cursor)
continue;
- itm->flags.garbage_colect = true;
+ itm->flags.bits.garbage_colect = true;
// Cosmetic changes: make them disappear from view instantly
- itm->flags.forbid = true;
- itm->flags.hidden = true;
+ itm->flags.bits.forbid = true;
+ itm->flags.bits.hidden = true;
}
// keeping track of item pile sizes ;)
it->second --;