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

Update xml, fix reaction_product::produce() parms

develop
Quietust 2020-06-23 13:36:00 -06:00
parent c2776c20b9
commit 3dcde1554a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/tweak/tweaks/reaction-gloves.h
Unescape Escape View File

@ -7,11 +7,15 @@
struct reaction_gloves_hook : df::reaction_product_itemst { struct reaction_gloves_hook : df::reaction_product_itemst {
typedef df::reaction_product_itemst interpose_base; typedef df::reaction_product_itemst interpose_base;
DEFINE_VMETHOD_INTERPOSE(void, produce, (df::unit *unit, std::vector<df::reaction_product*> *out_products, std::vector<df::item*> *out_items, std::vector<df::reaction_reagent*> *in_reag, std::vector<df::item*> *in_items, int32_t quantity, df::job_skill skill, df::historical_entity *entity, int32_t unk_1, df::world_site *site, void *unk_2)) DEFINE_VMETHOD_INTERPOSE(void, produce, (df::unit *unit,
std::vector<df::reaction_product*> *out_products, std::vector<df::item*> *out_items,
std::vector<df::reaction_reagent*> *in_reag, std::vector<df::item*> *in_items,
int32_t quantity, df::job_skill skill, int32_t quality,
df::historical_entity *entity, df::world_site *site, std::vector<void *> *unk_2))
{ {
if (item_type != df::item_type::GLOVES) if (item_type != df::item_type::GLOVES)
{ {
INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2); INTERPOSE_NEXT(produce)(unit, out_products, out_items, in_reag, in_items, quantity, skill, quality, entity, site, unk_2);
return; return;
} }
@ -45,7 +49,7 @@ struct reaction_gloves_hook : df::reaction_product_itemst {
count *= num_hands; count *= num_hands;
} }
INTERPOSE_NEXT(produce)(unit, out_products, &out_items_temp, in_reag, in_items, quantity, skill, entity, unk_1, site, unk_2); INTERPOSE_NEXT(produce)(unit, out_products, &out_items_temp, in_reag, in_items, quantity, skill, quality, entity, site, unk_2);
count = old_count; count = old_count;
// If the reaction was somehow asked to produce multiple sets (due to excess inputs), multiply the outputs too // If the reaction was somehow asked to produce multiple sets (due to excess inputs), multiply the outputs too