From 015f760d7f18fdd8c0b0e72a2161371179f7e37f Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 4 Oct 2024 10:32:15 -0500 Subject: [PATCH] reenable forceequip --- plugins/CMakeLists.txt | 2 +- plugins/forceequip.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index f0b35ea9ef..e49f505b23 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -121,7 +121,7 @@ if(BUILD_SUPPORTED) #dfhack_plugin(fixveins fixveins.cpp) dfhack_plugin(flows flows.cpp) #dfhack_plugin(follow follow.cpp) - #dfhack_plugin(forceequip forceequip.cpp) + dfhack_plugin(forceequip forceequip.cpp) #dfhack_plugin(generated-creature-renamer generated-creature-renamer.cpp) dfhack_plugin(getplants getplants.cpp) dfhack_plugin(hotkeys hotkeys.cpp LINK_LIBRARIES lua) diff --git a/plugins/forceequip.cpp b/plugins/forceequip.cpp index 4c09fef701..771828d41b 100644 --- a/plugins/forceequip.cpp +++ b/plugins/forceequip.cpp @@ -237,7 +237,7 @@ static bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *u return false; } - if (!Items::moveToInventory(mc, item, unit, df::unit_inventory_item::Worn, bpIndex)) + if (!Items::moveToInventory(item, unit, df::unit_inventory_item::Worn, bpIndex)) { if (verbose) { Core::printerr("\nEquipping failed - failed to retrieve item from its current location/container/inventory. Please move it to the ground and try again.\n"); } return false;