MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant 'virtual' attributes

develop
Myk Taylor 2023-04-22 14:42:25 -07:00
parent 5ffbb4d0ef
commit 8eb6226336
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/logistics.cpp
Unescape Escape View File

@ -252,11 +252,11 @@ public:
MeltStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats &stats) MeltStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats &stats)
: StockProcessor("melt", stockpile_number, enabled, stats) { } : StockProcessor("melt", stockpile_number, enabled, stats) { }
virtual bool is_designated(color_ostream &out, df::item *item) override { bool is_designated(color_ostream &out, df::item *item) override {
return item->flags.bits.melt; return item->flags.bits.melt;
} }
virtual bool can_designate(color_ostream &out, df::item *item) override { bool can_designate(color_ostream &out, df::item *item) override {
MaterialInfo mat(item); MaterialInfo mat(item);
if (mat.getCraftClass() != df::craft_material_class::Metal) if (mat.getCraftClass() != df::craft_material_class::Metal)
return false; return false;
@ -290,7 +290,7 @@ public:
return true; return true;
} }
virtual bool designate(color_ostream &out, df::item *item) override { bool designate(color_ostream &out, df::item *item) override {
insert_into_vector(world->items.other.ANY_MELT_DESIGNATED, &df::item::id, item); insert_into_vector(world->items.other.ANY_MELT_DESIGNATED, &df::item::id, item);
item->flags.bits.melt = 1; item->flags.bits.melt = 1;
return true; return true;
@ -303,17 +303,17 @@ public:
: StockProcessor("trade", stockpile_number, enabled && get_active_trade_depot(), stats), : StockProcessor("trade", stockpile_number, enabled && get_active_trade_depot(), stats),
depot(get_active_trade_depot()) { } depot(get_active_trade_depot()) { }
virtual bool is_designated(color_ostream& out, df::item* item) override { bool is_designated(color_ostream& out, df::item* item) override {
auto ref = Items::getSpecificRef(item, df::specific_ref_type::JOB); auto ref = Items::getSpecificRef(item, df::specific_ref_type::JOB);
return ref && ref->data.job && return ref && ref->data.job &&
ref->data.job->job_type == df::job_type::BringItemToDepot; ref->data.job->job_type == df::job_type::BringItemToDepot;
} }
virtual bool can_designate(color_ostream& out, df::item* item) override { bool can_designate(color_ostream& out, df::item* item) override {
return Items::canTradeWithContents(item); return Items::canTradeWithContents(item);
} }
virtual bool designate(color_ostream& out, df::item* item) override { bool designate(color_ostream& out, df::item* item) override {
if (!depot) if (!depot)
return false; return false;
@ -383,15 +383,15 @@ public:
DumpStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats& stats) DumpStockProcessor(int32_t stockpile_number, bool enabled, ProcessorStats& stats)
: StockProcessor("dump", stockpile_number, enabled, stats) { } : StockProcessor("dump", stockpile_number, enabled, stats) { }
virtual bool is_designated(color_ostream& out, df::item* item) override { bool is_designated(color_ostream& out, df::item* item) override {
return item->flags.bits.dump; return item->flags.bits.dump;
} }
virtual bool can_designate(color_ostream& out, df::item* item) override { bool can_designate(color_ostream& out, df::item* item) override {
return true; return true;
} }
virtual bool designate(color_ostream& out, df::item* item) override { bool designate(color_ostream& out, df::item* item) override {
item->flags.bits.dump = true; item->flags.bits.dump = true;
return true; return true;
} }