diff --git a/plugins/add-spatter.cpp b/plugins/add-spatter.cpp index 60bcce38f..45d636d7c 100644 --- a/plugins/add-spatter.cpp +++ b/plugins/add-spatter.cpp @@ -244,7 +244,7 @@ struct product_hook : improvement_product { DEFINE_VMETHOD_INTERPOSE( void, produce, (df::unit *unit, - std::vector *unk, + std::vector *out_products, std::vector *out_items, std::vector *in_reag, std::vector *in_items, @@ -295,7 +295,7 @@ struct product_hook : improvement_product { return; } - INTERPOSE_NEXT(produce)(unit, unk, out_items, in_reag, in_items, quantity, skill, entity, site); + INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, site); } }; diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp index 8c71dda40..33cd05f70 100644 --- a/plugins/createitem.cpp +++ b/plugins/createitem.cpp @@ -70,10 +70,10 @@ DFhackCExport command_result plugin_shutdown ( color_ostream &out ) bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_item = false) { + vector out_products; vector out_items; vector in_reag; vector in_items; - vector unk; bool is_gloves = (prod->item_type == item_type::GLOVES); bool is_shoes = (prod->item_type == item_type::SHOES); @@ -84,7 +84,7 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it if (dest_building != -1) building = df::building::find(dest_building); - prod->produce(unit, &unk, &out_items, &in_reag, &in_items, 1, job_skill::NONE, + prod->produce(unit, &out_products, &out_items, &in_reag, &in_items, 1, job_skill::NONE, df::historical_entity::find(unit->civ_id), (World::isFortressMode()) ? df::world_site::find(ui->site_id) : NULL); if (!out_items.size()) diff --git a/plugins/diggingInvaders/assignJob.cpp b/plugins/diggingInvaders/assignJob.cpp index 94acbd988..b7ca6f161 100644 --- a/plugins/diggingInvaders/assignJob.cpp +++ b/plugins/diggingInvaders/assignJob.cpp @@ -252,11 +252,11 @@ int32_t assignJob(color_ostream& out, Edge firstImportantEdge, unordered_mapcount = 1; prod->product_dimension = 1; + vector out_products; vector out_items; vector in_reag; vector in_items; - vector unk; - prod->produce(firstInvader, &unk, &out_items, &in_reag, &in_items, 1, df::job_skill::NONE, + prod->produce(firstInvader, &out_products, &out_items, &in_reag, &in_items, 1, df::job_skill::NONE, df::historical_entity::find(firstInvader->civ_id), df::world_site::find(df::global::ui->site_id)); diff --git a/plugins/eventful.cpp b/plugins/eventful.cpp index 01537f57e..7ad10a3ba 100644 --- a/plugins/eventful.cpp +++ b/plugins/eventful.cpp @@ -310,7 +310,7 @@ struct product_hook : item_product { DEFINE_VMETHOD_INTERPOSE( void, produce, (df::unit *unit, - std::vector *unk, + std::vector *out_products, std::vector *out_items, std::vector *in_reag, std::vector *in_items, @@ -320,7 +320,7 @@ struct product_hook : item_product { color_ostream_proxy out(Core::getInstance().getConsole()); auto product = products[this]; if ( !product ) { - INTERPOSE_NEXT(produce)(unit, unk, out_items, in_reag, in_items, quantity, skill, entity, site); + INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, site); return; } df::reaction* this_reaction=product->react; @@ -331,7 +331,7 @@ struct product_hook : item_product { return; size_t out_item_count = out_items->size(); - INTERPOSE_NEXT(produce)(unit, unk, out_items, in_reag, in_items, quantity, skill, entity, site); + INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, site); if ( out_items->size() == out_item_count ) return; //if it produced something, call the scripts