From 917d63fc8eea5a1522c747aa50067bea6b53724f Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sun, 23 Aug 2026 19:07:47 -0600
Subject: [PATCH 1/2] Remove "save_version" enum

It hasn't been maintained since version 50.01, and there's no reason to
keep it in df-structures anyways (it's already been moved to the DF
wiki where it belongs).

Resolves #873
---
 df.abstract_building.xml  |   2 +-
 df.activity.xml           |   4 +-
 df.art_image.xml          |   4 +-
 df.block.xml              |   6 +-
 df.building.xml           |   2 +-
 df.creation_zone.xml      |   2 +-
 df.d_interface.xml        |   2 +-
 df.dfhack.xml             | 130 --------------------------------------
 df.entity.xml             |   2 +-
 df.feature.xml            |   6 +-
 df.flow.xml               |   2 +-
 df.game_v.xml             |   8 +--
 df.history_collection.xml |   2 +-
 df.history_event.xml      |   2 +-
 df.history_figure.xml     |   6 +-
 df.interaction.xml        |   6 +-
 df.item.xml               |   4 +-
 df.machine.xml            |   2 +-
 df.mental_picture.xml     |   4 +-
 df.proj.xml               |   2 +-
 df.reference.xml          |   2 +-
 df.region.xml             |   2 +-
 df.script.xml             |   2 +-
 df.site_realization.xml   |   2 +-
 df.squad.xml              |   2 +-
 df.world.xml              |   2 +-
 df.world_construction.xml |   4 +-
 27 files changed, 40 insertions(+), 174 deletions(-)

diff --git a/df.abstract_building.xml b/df.abstract_building.xml
index 34d0744211..7593114a37 100644
--- a/df.abstract_building.xml
+++ b/df.abstract_building.xml
@@ -154,7 +154,7 @@
 
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='int32_t' name='getReligionID' original-name='get_entity_id'/>
diff --git a/df.activity.xml b/df.activity.xml
index 9b5eb9afd0..d68f2f7cbf 100644
--- a/df.activity.xml
+++ b/df.activity.xml
@@ -119,7 +119,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='bool' name='isEmpty' original-name='is_bad'
@@ -834,7 +834,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
         </virtual-methods>
     </class-type>
diff --git a/df.art_image.xml b/df.art_image.xml
index c21f79e6d7..3cb2357f85 100644
--- a/df.art_image.xml
+++ b/df.art_image.xml
@@ -6,7 +6,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='art_image_element_type' name='getType' original-name='type'/>
             <vmethod name='setID' original-name='set_subtype'> <int32_t name='st' comment='race, item type, plant ID, or shape ID'/> </vmethod>
@@ -83,7 +83,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='art_image_property_type' name='getType' original-name='type'/>
             <vmethod is-destructor='true'/>
diff --git a/df.block.xml b/df.block.xml
index f44cf8efde..df59aeb33a 100644
--- a/df.block.xml
+++ b/df.block.xml
@@ -41,7 +41,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='bool' name='isEmpty' original-name='is_empty'/>
             <vmethod is-destructor='true'/>
@@ -340,7 +340,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
         </virtual-methods>
     </class-type>
@@ -367,7 +367,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
         </virtual-methods>
     </class-type>
diff --git a/df.building.xml b/df.building.xml
index 67725eb3f0..f522469563 100644
--- a/df.building.xml
+++ b/df.building.xml
@@ -490,7 +490,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='bool' name='isImpassableAtCreation' original-name='perimdestroyer'
                      comment='the true set looks like things where the unit should stand aside'/>
diff --git a/df.creation_zone.xml b/df.creation_zone.xml
index 7d46ad734c..86b19b9859 100644
--- a/df.creation_zone.xml
+++ b/df.creation_zone.xml
@@ -14,7 +14,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod name='apply_to_map'><pointer name='map' comment='map_generatorst'/></vmethod>
diff --git a/df.d_interface.xml b/df.d_interface.xml
index bb5bce4bbe..f8fee032dd 100644
--- a/df.d_interface.xml
+++ b/df.d_interface.xml
@@ -6515,7 +6515,7 @@
     <class-type type-name='viewscreen_adopt_regionst' inherits-from='viewscreen'>
         <compound type-name='file_compressorst' name='compressor' original-name='filecomp'/>
         <enum type-name='adopt_region_stage_type' name='cur_step' original-name='adopt_stage'/>
-        <enum type-name='save_version' name='save_version' original-name='loadversion'/>
+        <int32_t name='save_version' original-name='loadversion'/>
         <compound type-name='region_headerst' name='cur_save' original-name='header'/>
         <compound type-name='region_object_datast' name='rod'/>
         <int32_t name='progress' original-name='stage_count' comment='0..35'/>
diff --git a/df.dfhack.xml b/df.dfhack.xml
index 2ac1e43c04..094bb410a5 100644
--- a/df.dfhack.xml
+++ b/df.dfhack.xml
@@ -826,136 +826,6 @@
         <enum-item name='CMV_0' value='10000'/>
         <enum-item name='CMV_1' value='10001' comment='adds support for sound'/>
     </enum-type>
-
-    <enum-type type-name='save_version' base-type='int32_t'>
-        <enum-item name='v0_21_93_19a' value='1107'/>
-        <enum-item name='v0_21_93_19c' value='1108'/>
-        <enum-item name='v0_21_95_19a' value='1108'/>
-        <enum-item name='v0_21_95_19b' value='1108'/>
-        <enum-item name='v0_21_95_19c' value='1110'/>
-        <enum-item name='v0_21_104_19d' value='1121'/>
-        <enum-item name='v0_21_104_21a' value='1123'/>
-        <enum-item name='v0_21_104_21b' value='1125'/>
-        <enum-item name='v0_21_105_21a' value='1128'/>
-        <enum-item name='v0_22_107_21a' value='1128'/>
-        <enum-item name='v0_22_110_22e' value='1134'/>
-        <enum-item name='v0_22_110_22f' value='1137'/>
-        <enum-item name='v0_22_110_23a' value='1148'/>
-        <enum-item name='v0_22_120_23a' value='1151'/>
-        <enum-item name='v0_22_121_23b' value='1161'/>
-        <enum-item name='v0_22_123_23a' value='1165'/>
-        <enum-item name='v0_23_130_23a' value='1169'/>
-
-        <enum-item name='v0_27_169_32a' value='1205'/>
-        <enum-item name='v0_27_169_33a' value='1206'/>
-        <enum-item name='v0_27_169_33b' value='1209'/>
-        <enum-item name='v0_27_169_33c' value='1211'/>
-        <enum-item name='v0_27_169_33d' value='1212'/>
-        <enum-item name='v0_28_181_39b' value='1255'/>
-        <enum-item name='v0_28_181_39c' value='1256'/>
-        <enum-item name='v0_28_181_39d' value='1259'/>
-        <enum-item name='v0_28_181_39e' value='1260'/>
-        <enum-item name='v0_28_181_39f' value='1261'/>
-        <enum-item name='v0_28_181_40a' value='1265'/>
-        <enum-item name='v0_28_181_40b' value='1266'/>
-        <enum-item name='v0_28_181_40c' value='1267'/>
-        <enum-item name='v0_28_181_40d' value='1268'/>
-
-        <enum-item name='v0_31_01' value='1287'/>
-        <enum-item name='v0_31_02' value='1288'/>
-        <enum-item name='v0_31_03' value='1289'/>
-        <enum-item name='v0_31_04' value='1292'/>
-        <enum-item name='v0_31_05' value='1295'/>
-        <enum-item name='v0_31_06' value='1297'/>
-        <enum-item name='v0_31_08' value='1300'/>
-        <enum-item name='v0_31_09' value='1304'/>
-        <enum-item name='v0_31_10' value='1305'/>
-        <enum-item name='v0_31_11' value='1310'/>
-        <enum-item name='v0_31_12' value='1311'/>
-        <enum-item name='v0_31_13' value='1323'/>
-        <enum-item name='v0_31_14' value='1325'/>
-        <enum-item name='v0_31_15' value='1326'/>
-        <enum-item name='v0_31_16' value='1327'/>
-        <enum-item name='v0_31_17' value='1340'/>
-        <enum-item name='v0_31_18' value='1341'/>
-        <enum-item name='v0_31_19' value='1351'/>
-        <enum-item name='v0_31_20' value='1353'/>
-        <enum-item name='v0_31_21' value='1354'/>
-        <enum-item name='v0_31_22' value='1359'/>
-        <enum-item name='v0_31_23' value='1360'/>
-        <enum-item name='v0_31_24' value='1361'/>
-        <enum-item name='v0_31_25' value='1362'/>
-
-        <enum-item name='v0_34_01' value='1372'/>
-        <enum-item name='v0_34_02' value='1374'/>
-        <enum-item name='v0_34_03' value='1376'/>
-        <enum-item name='v0_34_04' value='1377'/>
-        <enum-item name='v0_34_05' value='1378'/>
-        <enum-item name='v0_34_06' value='1382'/>
-        <enum-item name='v0_34_07' value='1383'/>
-        <enum-item name='v0_34_08' value='1400'/>
-        <enum-item name='v0_34_09' value='1402'/>
-        <enum-item name='v0_34_10' value='1403'/>
-        <enum-item name='v0_34_11' value='1404'/>
-
-        <enum-item name='v0_40_01' value='1441'/>
-        <enum-item name='v0_40_02' value='1442'/>
-        <enum-item name='v0_40_03' value='1443'/>
-        <enum-item name='v0_40_04' value='1444'/>
-        <enum-item name='v0_40_05' value='1445'/>
-        <enum-item name='v0_40_06' value='1446'/>
-        <enum-item name='v0_40_07' value='1448'/>
-        <enum-item name='v0_40_08' value='1449'/>
-        <enum-item name='v0_40_09' value='1451'/>
-        <enum-item name='v0_40_10' value='1452'/>
-        <enum-item name='v0_40_11' value='1456'/>
-        <enum-item name='v0_40_12' value='1459'/>
-        <enum-item name='v0_40_13' value='1462'/>
-        <enum-item name='v0_40_14' value='1469'/>
-        <enum-item name='v0_40_15' value='1470'/>
-        <enum-item name='v0_40_16' value='1471'/>
-        <enum-item name='v0_40_17' value='1472'/>
-        <enum-item name='v0_40_18' value='1473'/>
-        <enum-item name='v0_40_19' value='1474'/>
-        <enum-item name='v0_40_20' value='1477'/>
-        <enum-item name='v0_40_21' value='1478'/>
-        <enum-item name='v0_40_22' value='1479'/>
-        <enum-item name='v0_40_23' value='1480'/>
-        <enum-item name='v0_40_24' value='1481'/>
-
-        <enum-item name='v0_42_01' value='1531'/>
-        <enum-item name='v0_42_02' value='1532'/>
-        <enum-item name='v0_42_03' value='1533'/>
-        <enum-item name='v0_42_04' value='1534'/>
-        <enum-item name='v0_42_05' value='1537'/>
-        <enum-item name='v0_42_06' value='1542'/>
-
-        <enum-item name='v0_43_01' value='1551'/>
-        <enum-item name='v0_43_02' value='1552'/>
-        <enum-item name='v0_43_03' value='1553'/>
-        <enum-item name='v0_43_04' value='1555'/>
-        <enum-item name='v0_43_05' value='1556'/>
-
-        <enum-item name='v0_44_01' value='1596'/>
-        <enum-item name='v0_44_02' value='1597'/>
-        <enum-item name='v0_44_03' value='1600'/>
-        <enum-item name='v0_44_04' value='1603'/>
-        <enum-item name='v0_44_05' value='1604'/>
-        <enum-item name='v0_44_06' value='1611'/>
-        <enum-item name='v0_44_07' value='1612'/>
-        <enum-item name='v0_44_08' value='1613'/>
-        <enum-item name='v0_44_09' value='1614'/>
-        <enum-item name='v0_44_10' value='1620'/>
-        <enum-item name='v0_44_11' value='1623'/>
-        <enum-item name='v0_44_12' value='1625'/>
-
-        <enum-item name='v0_47_01' value='1710'/>
-        <enum-item name='v0_47_02' value='1711'/>
-        <enum-item name='v0_47_03' value='1713'/>
-        <enum-item name='v0_47_04' value='1715'/>
-        <enum-item name='v0_47_05' value='1716'/>
-        <!-- LAST_SAVE_VERSION (leave this comment here for automated updates) -->
-    </enum-type>
 </data-definition>
 
 <!--
diff --git a/df.entity.xml b/df.entity.xml
index 8d72f07df0..d3abfa2101 100644
--- a/df.entity.xml
+++ b/df.entity.xml
@@ -97,7 +97,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.feature.xml b/df.feature.xml
index 4b118d684d..5ceb78707d 100644
--- a/df.feature.xml
+++ b/df.feature.xml
@@ -69,7 +69,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -99,7 +99,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='shiftCoords' original-name='shift_locations'><int16_t name='shiftx'/><int16_t name='shifty'/><int16_t name='shiftz'/></vmethod>
             <vmethod name='discovery_realize' comment='originally used in 40d to populate demon pits'/>
@@ -160,7 +160,7 @@
             </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
                 <bool name='active_game'/>
             </vmethod>
             <vmethod name='createFeature' original-name='allocate_feature_for_load'>
diff --git a/df.flow.xml b/df.flow.xml
index 2692056a4b..2449fbbb69 100644
--- a/df.flow.xml
+++ b/df.flow.xml
@@ -61,7 +61,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='advance_flow'><pointer type-name='flow_info' name='ef'/></vmethod>
             <vmethod is-destructor='true'/>
diff --git a/df.game_v.xml b/df.game_v.xml
index 2937fb7d82..9fac5af648 100644
--- a/df.game_v.xml
+++ b/df.game_v.xml
@@ -7,13 +7,9 @@
 
     <global-object type-name='interfacest' name='gview'/>
 
-    <global-object name='version'>
-        <enum base-type='int32_t' type-name='save_version'/>
-    </global-object>
+    <global-object type-name='int32_t' name='version'/>
 
-    <global-object name='min_load_version'>
-        <enum base-type='int32_t' type-name='save_version'/>
-    </global-object>
+    <global-object type-name='int32_t' name='min_load_version'/>
     <global-object name='movie_version'>
         <enum base-type='int32_t' type-name='cmv_version'/>
     </global-object>
diff --git a/df.history_collection.xml b/df.history_collection.xml
index 6af1320ec7..92797e836d 100644
--- a/df.history_collection.xml
+++ b/df.history_collection.xml
@@ -47,7 +47,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='categorize' original-name='add_to_arrays'/>
 
diff --git a/df.history_event.xml b/df.history_event.xml
index 753ef517dd..0ffd4730c8 100644
--- a/df.history_event.xml
+++ b/df.history_event.xml
@@ -284,7 +284,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='add_to_classes' comment='records event in historical_entity.diplomacy in both directions if applicable'/>
             <vmethod is-destructor='true'/>
diff --git a/df.history_figure.xml b/df.history_figure.xml
index e69b158e9c..931a3cbbeb 100644
--- a/df.history_figure.xml
+++ b/df.history_figure.xml
@@ -821,7 +821,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='int32_t' name='getSquadId' original-name='get_squad_id'/>
             <vmethod ret-type='int32_t' name='getSquadPosition' original-name='get_squad_position'/>
@@ -909,7 +909,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='generate_xml' original-name='xml_dump'>
                 <pointer type-name='stl-fstream' name='fseed'/>
@@ -951,7 +951,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='generate_xml' original-name='xml_dump'>
                 <pointer type-name='stl-fstream' name='fseed'/>
diff --git a/df.interaction.xml b/df.interaction.xml
index 6cb3a7f37b..01df485fd7 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -33,7 +33,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='bool' name='parseRaws' original-name='adopt_line'>
@@ -149,7 +149,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod ret-type='bool' name='parseRaws' original-name='adopt_line'>
@@ -258,7 +258,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
             <vmethod name='activateOnUnit' original-name='apply_to_unit'>
diff --git a/df.item.xml b/df.item.xml
index 02644407ed..a16f52f24b 100644
--- a/df.item.xml
+++ b/df.item.xml
@@ -240,7 +240,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
 
             <vmethod ret-type='improvement_type' name='getType' original-name='type'/>
@@ -767,7 +767,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
 
             <vmethod name='getWeaponAttacks' original-name='get_itemdef_attack_vector'>
diff --git a/df.machine.xml b/df.machine.xml
index 93ec6720a3..ee63d1a71d 100644
--- a/df.machine.xml
+++ b/df.machine.xml
@@ -44,7 +44,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.mental_picture.xml b/df.mental_picture.xml
index 3a5c8003ba..38754e10e1 100644
--- a/df.mental_picture.xml
+++ b/df.mental_picture.xml
@@ -13,7 +13,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -51,7 +51,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.proj.xml b/df.proj.xml
index c2fb505b84..e626b9d127 100644
--- a/df.proj.xml
+++ b/df.proj.xml
@@ -81,7 +81,7 @@
             <vmethod ret-type='bool' name='checkMovement' original-name='advance'/>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='print'><pointer type-name='map_viewport' name='rparam'/></vmethod>
diff --git a/df.reference.xml b/df.reference.xml
index c2988e9ba8..4e2be0e70f 100644
--- a/df.reference.xml
+++ b/df.reference.xml
@@ -164,7 +164,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='general_ref_type' name='getType' original-name='type'/>
             <vmethod name='getItem' original-name='get_item'>
diff --git a/df.region.xml b/df.region.xml
index 668461a2ea..92b707e075 100644
--- a/df.region.xml
+++ b/df.region.xml
@@ -739,7 +739,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='bool' name='isEmpty' original-name='is_empty'/>
             <vmethod is-destructor='true'/>
diff --git a/df.script.xml b/df.script.xml
index 5aa1cb36ce..bffcbdc8fa 100644
--- a/df.script.xml
+++ b/df.script.xml
@@ -22,7 +22,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.site_realization.xml b/df.site_realization.xml
index ddecdd9fe7..f5095aac27 100644
--- a/df.site_realization.xml
+++ b/df.site_realization.xml
@@ -48,7 +48,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
diff --git a/df.squad.xml b/df.squad.xml
index 354925292c..57fd4d2346 100644
--- a/df.squad.xml
+++ b/df.squad.xml
@@ -45,7 +45,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod ret-type='squad_order_type' name='getType' original-name='type'/>
             <vmethod ret-type='bool' name='isPatrol' original-name='counts_for_complaints'/> whether or not dwarves get unhappy while doing this
diff --git a/df.world.xml b/df.world.xml
index 9ee782d181..70276850a6 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -683,7 +683,7 @@
         <compound type-name='building_use_controllerst' name='building_uses' original-name='building_use_controller'/>
 
         <df-flagarray name='flags' original-name='flag' index-enum='world_flags'/>
-        <enum type-name='save_version' name='original_save_version' original-name='version_at_creation' comment='DF version on which the world was first created'/>
+        <int32_t name='original_save_version' original-name='version_at_creation' comment='DF version on which the world was first created'/>
 
         <compound name='worldgen'> not a compound
             <stl-string name='version' original-name='version_string'/>
diff --git a/df.world_construction.xml b/df.world_construction.xml
index ffea983f72..f5f32dea40 100644
--- a/df.world_construction.xml
+++ b/df.world_construction.xml
@@ -23,7 +23,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>
@@ -70,7 +70,7 @@
             <vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
             <vmethod name='read_file'>
                 <pointer type-name='file_compressorst' name='filecomp'/>
-                <enum type-name='save_version' name='loadversion'/>
+                <int32_t name='loadversion'/>
             </vmethod>
             <vmethod is-destructor='true'/>
         </virtual-methods>

From e5dc62894042349c665c186ca60c6a35058a2d01 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Sun, 23 Aug 2026 19:17:03 -0600
Subject: [PATCH 2/2] Get rid of cmv_version too

---
 df.dfhack.xml | 5 -----
 df.game_v.xml | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/df.dfhack.xml b/df.dfhack.xml
index 094bb410a5..1982340217 100644
--- a/df.dfhack.xml
+++ b/df.dfhack.xml
@@ -821,11 +821,6 @@
         <enum-item name='Combat'/>
         <enum-item name='Work'/>
     </enum-type>
-
-    <enum-type type-name='cmv_version' base-type='int32_t'>
-        <enum-item name='CMV_0' value='10000'/>
-        <enum-item name='CMV_1' value='10001' comment='adds support for sound'/>
-    </enum-type>
 </data-definition>
 
 <!--
diff --git a/df.game_v.xml b/df.game_v.xml
index 9fac5af648..d1e3782562 100644
--- a/df.game_v.xml
+++ b/df.game_v.xml
@@ -10,9 +10,7 @@
     <global-object type-name='int32_t' name='version'/>
 
     <global-object type-name='int32_t' name='min_load_version'/>
-    <global-object name='movie_version'>
-        <enum base-type='int32_t' type-name='cmv_version'/>
-    </global-object>
+    <global-object type-name='int32_t' name='movie_version'/>
     <global-object name='flows' original-name='event_flow'>
         <stl-vector pointer-type='flow_info'/>
     </global-object>