Merge pull request #4368 from myk002/myk_use_mode

use new building item mode enum
DFHack · Mar 14, 2024 · cf5b83e · cf5b83e
2 parents 1c1b1bf + ef16e3c
commit cf5b83e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/library/LuaApi.cpp b/library/LuaApi.cpp
@@ -2335,7 +2335,7 @@ static int items_moveToBuilding(lua_State *state)
     MapExtras::MapCache mc;
     auto item = Lua::CheckDFObject<df::item>(state, 1);
     auto building = Lua::CheckDFObject<df::building_actual>(state, 2);
-    int use_mode = luaL_optint(state, 3, 0);
+    df::building_item_role_type use_mode = (df::building_item_role_type)luaL_optint(state, 3, 0);
     bool force_in_building = lua_toboolean(state, 4);
     lua_pushboolean(state, Items::moveToBuilding(mc, item, building, use_mode, force_in_building));
     return 1;

diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
@@ -34,6 +34,7 @@ distribution.
 
 #include "modules/Materials.h"
 
+#include "df/building_item_role_type.h"
 #include "df/item_type.h"
 #include "df/job_item_vector_id.h"
 #include "df/specific_ref.h"
@@ -155,7 +156,7 @@ DFHACK_EXPORT std::string getDescription(df::item *item, int type = 0, bool deco
 DFHACK_EXPORT bool moveToGround(MapExtras::MapCache &mc, df::item *item, df::coord pos);
 DFHACK_EXPORT bool moveToContainer(MapExtras::MapCache &mc, df::item *item, df::item *container);
 DFHACK_EXPORT bool moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,
-    int16_t use_mode = 0, bool force_in_building = false);
+    df::building_item_role_type use_mode = df::building_item_role_type::TEMP, bool force_in_building = false);
 DFHACK_EXPORT bool moveToInventory(MapExtras::MapCache &mc, df::item *item, df::unit *unit,
     df::unit_inventory_item::T_mode mode = df::unit_inventory_item::Hauled, int body_part = -1);
 

diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp
@@ -1057,7 +1057,7 @@ bool DFHack::Items::moveToContainer(MapExtras::MapCache &mc, df::item *item, df:
 }
 
 bool DFHack::Items::moveToBuilding(MapExtras::MapCache &mc, df::item *item, df::building_actual *building,
-    int16_t use_mode, bool force_in_building)
+    df::building_item_role_type use_mode, bool force_in_building)
 {
     CHECK_NULL_POINTER(item);
     CHECK_NULL_POINTER(building);

diff --git a/library/xml b/library/xml
diff --git a/plugins/createitem.cpp b/plugins/createitem.cpp
@@ -101,7 +101,7 @@ bool makeItem (df::reaction_product_itemst *prod, df::unit *unit, bool second_it
         else if (building)
         {
             out_items[i]->flags.bits.removed = 1;
-            if (!Items::moveToBuilding(mc, out_items[i], (df::building_actual *)building, 0))
+            if (!Items::moveToBuilding(mc, out_items[i], (df::building_actual *)building, df::building_item_role_type::TEMP))
                 out_items[i]->moveToGround(building->centerx, building->centery, building->z);
         }
         else if (move_to_cursor)

diff --git a/scripts b/scripts
+1 −1		deep-embark.lua
+1 −1		fix/general-strike.lua
+1 −1		internal/caravan/movegoods.lua
+2 −2		internal/caravan/pedestal.lua
+3 −1		undump-buildings.lua