From c94aa8d28cdc0ec2c14cfd9e45cdd4b93e18f0de Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Tue, 31 Oct 2023 16:56:45 -0700
Subject: [PATCH] prep for more tiles actions

---
 plugins/burrow.cpp | 124 ++++++++++++++++++++++-----------------------
 1 file changed, 60 insertions(+), 64 deletions(-)

diff --git a/plugins/burrow.cpp b/plugins/burrow.cpp
index 59da9b929..5e6158de9 100644
--- a/plugins/burrow.cpp
+++ b/plugins/burrow.cpp
@@ -8,8 +8,10 @@
 #include "modules/Persistence.h"
 #include "modules/World.h"
 
+#include "df/block_burrow.h"
 #include "df/burrow.h"
 #include "df/tile_designation.h"
+#include "df/unit.h"
 #include "df/world.h"
 
 using std::vector;
@@ -253,6 +255,42 @@ static int burrow_tiles_clear(lua_State *L) {
     return 1;
 }
 
+static void copyTiles(df::burrow *target, df::burrow *source, bool enable)
+{
+    CHECK_NULL_POINTER(target);
+    CHECK_NULL_POINTER(source);
+
+    if (source == target) {
+        if (!enable)
+            Burrows::clearTiles(target);
+        return;
+    }
+
+    vector<df::map_block*> pvec;
+    Burrows::listBlocks(&pvec, source);
+
+    for (auto block : pvec) {
+        auto smask = Burrows::getBlockMask(source, block);
+        if (!smask)
+            continue;
+
+        auto tmask = Burrows::getBlockMask(target, block, enable);
+        if (!tmask)
+            continue;
+
+        if (enable) {
+            for (int j = 0; j < 16; j++)
+                tmask->tile_bitmask[j] |= smask->tile_bitmask[j];
+        } else {
+            for (int j = 0; j < 16; j++)
+                tmask->tile_bitmask[j] &= ~smask->tile_bitmask[j];
+
+            if (!tmask->has_assignments())
+                Burrows::deleteBlockMask(target, block, tmask);
+        }
+    }
+}
+
 static int burrow_tiles_set(lua_State *L) {
     color_ostream *out = Lua::GetOutput(L);
     if (!out)
@@ -436,6 +474,28 @@ static int burrow_units_clear(lua_State *L) {
     return 0;
 }
 
+static void copyUnits(df::burrow *target, df::burrow *source, bool enable)
+{
+    CHECK_NULL_POINTER(target);
+    CHECK_NULL_POINTER(source);
+
+    if (source == target)
+    {
+        if (!enable)
+            Burrows::clearUnits(target);
+
+        return;
+    }
+
+    for (size_t i = 0; i < source->units.size(); i++)
+    {
+        auto unit = df::unit::find(source->units[i]);
+
+        if (unit)
+            Burrows::setAssignedUnit(target, unit, enable);
+    }
+}
+
 static int burrow_units_set(lua_State *L) {
     color_ostream *out = Lua::GetOutput(L);
     if (!out)
@@ -892,70 +952,6 @@ static df::burrow *findByName(color_ostream &out, std::string name, bool silent
     return rv;
 }
 
-static void copyUnits(df::burrow *target, df::burrow *source, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-    CHECK_NULL_POINTER(source);
-
-    if (source == target)
-    {
-        if (!enable)
-            Burrows::clearUnits(target);
-
-        return;
-    }
-
-    for (size_t i = 0; i < source->units.size(); i++)
-    {
-        auto unit = df::unit::find(source->units[i]);
-
-        if (unit)
-            Burrows::setAssignedUnit(target, unit, enable);
-    }
-}
-
-static void copyTiles(df::burrow *target, df::burrow *source, bool enable)
-{
-    CHECK_NULL_POINTER(target);
-    CHECK_NULL_POINTER(source);
-
-    if (source == target)
-    {
-        if (!enable)
-            Burrows::clearTiles(target);
-
-        return;
-    }
-
-    std::vector<df::map_block*> pvec;
-    Burrows::listBlocks(&pvec, source);
-
-    for (size_t i = 0; i < pvec.size(); i++)
-    {
-        auto block = pvec[i];
-        auto smask = Burrows::getBlockMask(source, block);
-        if (!smask)
-            continue;
-
-        auto tmask = Burrows::getBlockMask(target, block, enable);
-        if (!tmask)
-            continue;
-
-        if (enable)
-        {
-            for (int j = 0; j < 16; j++)
-                tmask->tile_bitmask[j] |= smask->tile_bitmask[j];
-        }
-        else
-        {
-            for (int j = 0; j < 16; j++)
-                tmask->tile_bitmask[j] &= ~smask->tile_bitmask[j];
-
-            if (!tmask->has_assignments())
-                Burrows::deleteBlockMask(target, block, tmask);
-        }
-    }
-}
 
 static void setTilesByDesignation(df::burrow *target, df::tile_designation d_mask,
                                   df::tile_designation d_value, bool enable)