diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index ccd78e513c..24cd6f64d0 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -92,7 +92,7 @@ if(BUILD_SUPPORTED) dfhack_plugin(autoslab autoslab.cpp) dfhack_plugin(blueprint blueprint.cpp LINK_LIBRARIES lua) dfhack_plugin(burrow burrow.cpp LINK_LIBRARIES lua) - #dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua) + dfhack_plugin(building-hacks building-hacks.cpp LINK_LIBRARIES lua) add_subdirectory(buildingplan) dfhack_plugin(changeitem changeitem.cpp) dfhack_plugin(changelayer changelayer.cpp) diff --git a/plugins/building-hacks.cpp b/plugins/building-hacks.cpp index 635d99261c..fa17311dde 100644 --- a/plugins/building-hacks.cpp +++ b/plugins/building-hacks.cpp @@ -88,8 +88,8 @@ struct work_hook : df::building_workshopst{ df::general_ref_creaturest* ref = static_cast(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); if (ref) { - info->produced = ref->unk_1; - info->consumed = ref->unk_2; + info->produced = ref->pop_id; + info->consumed = ref->num; return true; } else @@ -118,18 +118,18 @@ struct work_hook : df::building_workshopst{ df::general_ref_creaturest* ref = static_cast(DFHack::Buildings::getGeneralRef(this, general_ref_type::CREATURE)); if (ref) { - ref->unk_1 = produced; - ref->unk_2 = consumed; + ref->pop_id = produced; + ref->num = consumed; } else { ref = df::allocate(); - ref->unk_1 = produced; - ref->unk_2 = consumed; + ref->pop_id = produced; + ref->num = consumed; general_refs.push_back(ref); } } - DEFINE_VMETHOD_INTERPOSE(uint32_t,getImpassableOccupancy,()) + DEFINE_VMETHOD_INTERPOSE(df::tile_building_occ,getImpassableOccupancy,()) { if(auto def = find_def()) { @@ -260,9 +260,9 @@ struct work_hook : df::building_workshopst{ } INTERPOSE_NEXT(updateAction)(); } - DEFINE_VMETHOD_INTERPOSE(void, drawBuilding, (df::building_drawbuffer *db, int16_t unk)) + DEFINE_VMETHOD_INTERPOSE(void, drawBuilding, (uint32_t curtick, df::building_drawbuffer *db, int16_t unk)) { - INTERPOSE_NEXT(drawBuilding)(db, unk); + INTERPOSE_NEXT(drawBuilding)(curtick, db, unk); if (auto def = find_def()) {