Removing dead duplicate code.

plugins/autolabor.cpp

@@ -1480,206 +1480,3 @@ command_result autolabor (color_ostream &out, std::vector <std::string> & parame
         return CR_OK;
     }
 }
-
-struct StockpileInfo {
-    df::building_stockpilest* sp;
-    int size;
-    int free;
-    int x1, x2, y1, y2, z;
-
-public:
-    StockpileInfo(df::building_stockpilest *sp_) : sp(sp_)
-    {
-        MapExtras::MapCache mc;
-
-        z = sp_->z;
-        x1 = sp_->room.x;
-        x2 = sp_->room.x + sp_->room.width;
-        y1 = sp_->room.y;
-        y2 = sp_->room.y + sp_->room.height;
-        int e = 0;
-        size = 0;
-        free = 0;
-        for (int y = y1; y < y2; y++)
-            for (int x = x1; x < x2; x++)
-                if (sp_->room.extents[e++] == 1)
-                {
-                    size++;
-                    DFCoord cursor (x,y,z);
-                    uint32_t blockX = x / 16;
-                    uint32_t tileX = x % 16;
-                    uint32_t blockY = y / 16;
-                    uint32_t tileY = y % 16;
-                    MapExtras::Block * b = mc.BlockAt(cursor/16);
-                    if(b && b->is_valid())
-                    {
-                        auto &block = *b->getRaw();
-                        df::tile_occupancy &occ = block.occupancy[tileX][tileY];
-                        if (!occ.bits.item)
-                            free++;
-                    }
-                }
-    }
-
-    bool isFull() { return free == 0; }
-
-    bool canHold(df::item *i)
-    {
-        return false;
-    }
-
-    bool inStockpile(df::item *i)
-    {
-        df::item *container = Items::getContainer(i);
-        if (container)
-            return inStockpile(container);
-
-        if (i->pos.z != z) return false;
-        if (i->pos.x < x1 || i->pos.x >= x2 ||
-            i->pos.y < y1 || i->pos.y >= y2) return false;
-        int e = (i->pos.x - x1) + (i->pos.y - y1) * sp->room.width;
-        return sp->room.extents[e] == 1;
-    }
-
-    int getId() { return sp->id; }
-};
-
-static int stockcheck(color_ostream &out, vector <string> & parameters)
-{
-    int count = 0;
-
-    std::vector<StockpileInfo*> stockpiles;
-
-    for (int i = 0; i < world->buildings.all.size(); ++i)
-    {
-        df::building *build = world->buildings.all[i];
-        auto type = build->getType();
-        if (building_type::Stockpile == type)
-        {
-            df::building_stockpilest *sp = virtual_cast<df::building_stockpilest>(build);
-            StockpileInfo *spi = new StockpileInfo(sp);
-            stockpiles.push_back(spi);
-        }
-
-    }
-
-    std::vector<df::item*> &items = world->items.other[items_other_id::IN_PLAY];
-
-    // Precompute a bitmask with the bad flags
-    df::item_flags bad_flags;
-    bad_flags.whole = 0;
-
-#define F(x) bad_flags.bits.x = true;
-    F(dump); F(forbid); F(garbage_collect);
-    F(hostile); F(on_fire); F(rotten); F(trader);
-    F(in_building); F(construction); F(artifact);
-    F(spider_web); F(owned); F(in_job);
-#undef F
-
-    for (size_t i = 0; i < items.size(); i++)
-    {
-        df::item *item = items[i];
-        if (item->flags.whole & bad_flags.whole)
-            continue;
-
-        // we really only care about MEAT, FISH, FISH_RAW, PLANT, CHEESE, FOOD, and EGG
-
-        df::item_type typ = item->getType();
-        if (typ != item_type::MEAT &&
-            typ != item_type::FISH &&
-            typ != item_type::FISH_RAW &&
-            typ != item_type::PLANT &&
-            typ != item_type::CHEESE &&
-            typ != item_type::FOOD &&
-            typ != item_type::EGG)
-            continue;
-
-        df::item *container = 0;
-        df::unit *holder = 0;
-        df::building *building = 0;
-
-        for (size_t i = 0; i < item->general_refs.size(); i++)
-        {
-            df::general_ref *ref = item->general_refs[i];
-
-            switch (ref->getType())
-            {
-            case general_ref_type::CONTAINED_IN_ITEM:
-                container = ref->getItem();
-                break;
-
-            case general_ref_type::UNIT_HOLDER:
-                holder = ref->getUnit();
-                break;
-
-            case general_ref_type::BUILDING_HOLDER:
-                building = ref->getBuilding();
-                break;
-
-            default:
-                break;
-            }
-        }
-
-        df::item *nextcontainer = container;
-        df::item *lastcontainer = 0;
-
-        while(nextcontainer) {
-            df::item *thiscontainer = nextcontainer;
-            nextcontainer = 0;
-            for (size_t i = 0; i < thiscontainer->general_refs.size(); i++)
-            {
-                df::general_ref *ref = thiscontainer->general_refs[i];
-
-                switch (ref->getType())
-                {
-                case general_ref_type::CONTAINED_IN_ITEM:
-                    lastcontainer = nextcontainer = ref->getItem();
-                    break;
-
-                case general_ref_type::UNIT_HOLDER:
-                    holder = ref->getUnit();
-                    break;
-
-                case general_ref_type::BUILDING_HOLDER:
-                    building = ref->getBuilding();
-                    break;
-
-                default:
-                    break;
-                }
-            }
-        }
-
-        if (holder)
-            continue; // carried items do not rot as far as i know
-
-        if (building) {
-            df::building_type btype = building->getType();
-            if (btype == building_type::TradeDepot ||
-                btype == building_type::Wagon)
-                continue; // items in trade depot or the embark wagon do not rot
-
-            if (typ == item_type::EGG && btype ==building_type::NestBox)
-                continue; // eggs in nest box do not rot
-        }
-
-        int canHoldCount = 0;
-        StockpileInfo *current = 0;
-
-        for (int idx = 0; idx < stockpiles.size(); idx++)
-        {
-            StockpileInfo *spi = stockpiles[idx];
-            if (spi->canHold(item)) canHoldCount++;
-            if (spi->inStockpile(item)) current=spi;
-        }
-
-        if (current)
-            continue;
-
-        count++;
-
-    }
-
-    return count;
-}