51.01-beta24

quietust · Oct 24, 2024 · 656647b · 656647b
1 parent e333c99
commit 656647b
Show file tree

Hide file tree

Showing 5 changed files with 708 additions and 577 deletions.
diff --git a/df.advmode.xml b/df.advmode.xml
@@ -923,6 +923,7 @@
 
     <class-type type-name='adventure_optionst'>
         <int32_t name='depth'/>
+        <enum name='option_list_context' type-name='adventure_interface_option_list_context_type'/>
 
         <virtual-methods>
             <vmethod name='getType' ret-type='adventure_option_type'/>

diff --git a/df.graphics.xml b/df.graphics.xml
@@ -304,17 +304,21 @@
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
 
-        <static-array type-name='int32_t' count='13310' name='texture_indices3'/>
+        <static-array type-name='int32_t' count='13760' name='texture_indices3'/>
         <stl-vector type-name='int32_t' name='texpos_boulder'/>
-        <static-array type-name='int32_t' count='3905' name='texture_indices4'/>
+        <static-array type-name='int32_t' count='3472' name='texture_indices4'/>
+        <static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
+        <static-array type-name='int32_t' count='128' name='texture_indices5'/>
+        <static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
+        <static-array type-name='int32_t' count='305' name='texture_indices6'/>
         <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
-        <static-array type-name='int32_t' count='7977' name='texture_indices5'/>
+        <static-array type-name='int32_t' count='7977' name='texture_indices7'/>
         <static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='101' name='texture_indices6'/>
+        <static-array type-name='int32_t' count='101' name='texture_indices8'/>
         <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='271' name='texture_indices7'/>
+        <static-array type-name='int32_t' count='270' name='texture_indices9'/>
         <static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='6845' name='texture_indices8'/>
+        <static-array type-name='int32_t' count='6845' name='texture_indices10'/>
     </struct-type>
 
     <struct-type type-name='interface_setst'>

diff --git a/df.map.xml b/df.map.xml
@@ -416,6 +416,8 @@
             <static-array count='16' type-name='int16_t' init-value='100'/>
         </static-array>
 
+        <int16_t name='minimum_river_z'/>
+
         <compound name='map_pos' type-name='coord' comment='top left in tiles'/>
         <compound name='region_pos' type-name='coord2d'/>