From e84c868077ef8e53d2d1c78f43105b482c0cdba0 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Thu, 14 May 2026 16:33:29 -0600
Subject: [PATCH] Initialize pool_id values to -1

to avoid potential mishaps with DF's pooled object manager
---
 df.announcement.xml    | 2 +-
 df.army.xml            | 2 +-
 df.army_controller.xml | 2 +-
 df.block.xml           | 2 +-
 df.entity.xml          | 2 +-
 df.history_figure.xml  | 2 +-
 df.nemesis.xml         | 2 +-
 df.unit.xml            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/df.announcement.xml b/df.announcement.xml
index 26da612b9..f4f7896c7 100644
--- a/df.announcement.xml
+++ b/df.announcement.xml
@@ -66,7 +66,7 @@
         <int32_t name='activity_event_id' ref-target='activity_event' since='v0.40.01'/>
         <int32_t name='speaker_id' original-name='speaker_unid' ref-target='unit' since='v0.40.01' comment='unit speaking the conversation'/>
 
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='popup_message' original-name='mega_announcementst'>
diff --git a/df.army.xml b/df.army.xml
index 25ee7031b..51a5f6d89 100644
--- a/df.army.xml
+++ b/df.army.xml
@@ -92,7 +92,7 @@
 
         <stl-vector pointer-type='item' name='items' original-name='item' since='v0.44.07'/>
 
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='army_handlerst'>
diff --git a/df.army_controller.xml b/df.army_controller.xml
index 5d11ddbfc..95f9c17c3 100644
--- a/df.army_controller.xml
+++ b/df.army_controller.xml
@@ -484,7 +484,7 @@
         </compound>
         <enum type-name='army_controller_goal_type' name='goal'/>
 
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='army_controller_handlerst'>
diff --git a/df.block.xml b/df.block.xml
index f078d9bec..f44cf8efd 100644
--- a/df.block.xml
+++ b/df.block.xml
@@ -249,7 +249,7 @@
         <compound type-name='coord' name='map_pos' original-name='start'/>
         <compound type-name='coord2d' name='region_pos' original-name='a'/>
 
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
 
         <static-array name='tiletype' original-name='map_tile' count='16'>
             <static-array count='16'>
diff --git a/df.entity.xml b/df.entity.xml
index d51a0b836..8d72f07df 100644
--- a/df.entity.xml
+++ b/df.entity.xml
@@ -1811,7 +1811,7 @@
 
         <int32_t name='temporary_count'/>
         -- protected --
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='entity_handlerst'>
diff --git a/df.history_figure.xml b/df.history_figure.xml
index bc566e1cf..e69b158e9 100644
--- a/df.history_figure.xml
+++ b/df.history_figure.xml
@@ -1083,7 +1083,7 @@
         <int32_t name='gen_material_skill_ip_sum' init-value='-1' since='v0.40.17-19'/>
         <int32_t name='defensive_skill_ip_sum' init-value='-1'/>
         -- protected --
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 </data-definition>
 
diff --git a/df.nemesis.xml b/df.nemesis.xml
index 531ac0a5d..69ccc8fbc 100644
--- a/df.nemesis.xml
+++ b/df.nemesis.xml
@@ -47,7 +47,7 @@
 
         <df-flagarray name='flags' original-name='flag' index-enum='nemesis_flags'/>
 
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
     </struct-type>
 
     <struct-type type-name='nemesis_handlerst'>
diff --git a/df.unit.xml b/df.unit.xml
index b5c9d0298..9d0757760 100644
--- a/df.unit.xml
+++ b/df.unit.xml
@@ -3136,7 +3136,7 @@
         <enum type-name='dungeon_control_state' name='dungeon_control'/>
 
         protected:
-        <size_t name='pool_id'/>
+        <size_t name='pool_id' init-value='-1'/>
         <stl-mutex name='mtx'/>
 
         <virtual-methods>