From f24d81856c46302dd2c7ae105aa8b8af52e08207 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Thu, 24 Jul 2025 08:58:52 -0600
Subject: [PATCH] Update structures for 52.02

---
 df.d_interface.xml           | 12 ++++++------
 df.g_src.files.xml           |  2 ++
 df.g_src.texture_handler.xml |  8 ++++----
 df.world.xml                 |  7 ++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/df.d_interface.xml b/df.d_interface.xml
index ecf84d319..55183598e 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -5993,7 +5993,7 @@
         <stl-vector pointer-type='stl-string' name='base_available_id'/>
         <stl-vector type-name='int32_t' name='base_available_numeric_version'/>
         <stl-vector type-name='int32_t' name='base_available_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='base_available_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='base_available_src_dir'/>
         <stl-vector pointer-type='stl-string' name='base_available_name'/>
         <stl-vector pointer-type='stl-string' name='base_available_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='base_available_mod_header'/>
@@ -6001,7 +6001,7 @@
         <stl-vector pointer-type='stl-string' name='object_load_order_id'/>
         <stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
         <stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_name'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='object_load_order_mod_header'/>
@@ -6009,7 +6009,7 @@
         <stl-vector pointer-type='stl-string' name='available_id'/>
         <stl-vector type-name='int32_t' name='available_numeric_version'/>
         <stl-vector type-name='int32_t' name='available_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='available_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='available_src_dir'/>
         <stl-vector pointer-type='stl-string' name='available_name'/>
         <stl-vector pointer-type='stl-string' name='available_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='available_mod_header'/>
@@ -6040,7 +6040,7 @@
         <stl-vector pointer-type='stl-string' name='base_available_id'/>
         <stl-vector type-name='int32_t' name='base_available_numeric_version'/>
         <stl-vector type-name='int32_t' name='base_available_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='base_available_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='base_available_src_dir'/>
         <stl-vector pointer-type='stl-string' name='base_available_name'/>
         <stl-vector pointer-type='stl-string' name='base_available_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='base_available_mod_header'/>
@@ -6048,7 +6048,7 @@
         <stl-vector pointer-type='stl-string' name='object_load_order_id'/>
         <stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
         <stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_name'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='object_load_order_mod_header'/>
@@ -6056,7 +6056,7 @@
         <stl-vector pointer-type='stl-string' name='available_id'/>
         <stl-vector type-name='int32_t' name='available_numeric_version'/>
         <stl-vector type-name='int32_t' name='available_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='available_src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='available_src_dir'/>
         <stl-vector pointer-type='stl-string' name='available_name'/>
         <stl-vector pointer-type='stl-string' name='available_displayed_version'/>
         <stl-vector pointer-type='mod_headerst' name='available_mod_header'/>
diff --git a/df.g_src.files.xml b/df.g_src.files.xml
index 9bc10c28c..a0e3f39b6 100644
--- a/df.g_src.files.xml
+++ b/df.g_src.files.xml
@@ -1,4 +1,6 @@
 <data-definition>
+    -- Unused: filest
+
     <struct-type type-name='file_compressorst' custom-methods='true'>
         Note: the assign operator is manually implemented
 
diff --git a/df.g_src.texture_handler.xml b/df.g_src.texture_handler.xml
index dab3e2f41..90ae904ba 100644
--- a/df.g_src.texture_handler.xml
+++ b/df.g_src.texture_handler.xml
@@ -5,8 +5,8 @@
 
     <struct-type type-name='palette_pagest' key-field='token'>
         <stl-string name='token'/>
-        <stl-string name='graphics_dir'/>
-        <stl-string name='filename'/>
+        <stl-fs-path name='graphics_dir'/>
+        <stl-fs-path name='filename'/>
 
         <int32_t name='default_row'/>
         <stl-vector name='color_token' pointer-type='stl-string'/>
@@ -17,8 +17,8 @@
 
     <struct-type type-name='tile_pagest' key-field='token'>
         <stl-string name='token'/>
-        <stl-string name='graphics_dir'/>
-        <stl-string name='filename'/>
+        <stl-fs-path name='graphics_dir'/>
+        <stl-fs-path name='filename'/>
 
         <int16_t name='tile_dim_x'/>
         <int16_t name='tile_dim_y'/>
diff --git a/df.world.xml b/df.world.xml
index 7da693256..ef9b90af8 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -151,10 +151,11 @@
         <stl-vector name='text_sets' pointer-type='stl-string'/>
         <stl-vector name='musics' pointer-type='stl-string'/>
         <stl-vector name='sounds' pointer-type='stl-string'/>
+
         <stl-vector name='mod_ids' pointer-type='stl-string'/>
         <stl-vector name='mod_versions' type-name='int32_t'/>
         <stl-vector name='mod_compatible_versions' type-name='int32_t'/>
-        <stl-vector name='mod_folder_paths' pointer-type='stl-string'/>
+        <stl-vector name='mod_folder_paths' type-name='stl-fs-path'/>
         <stl-vector name='mod_names' pointer-type='stl-string'/>
         <stl-vector name='mod_display_versions' pointer-type='stl-string'/>
     </struct-type>
@@ -328,8 +329,8 @@
         <stl-vector pointer-type='stl-string' name='object_load_order_id'/>
         <stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
         <stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
-        <stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
-        <stl-string name='src_dir'/>
+        <stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
+        <stl-fs-path name='src_dir'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_name'/>
         <stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
     </struct-type>