Skip to content

Commit 7d1b4ab

Browse files
committed
Update structures for 53.15
And a few other minor tweaks: * Fix vmethod signature in art_image_propertyst * Remove some stale unordered_map / unordered_set comments
1 parent 01aae95 commit 7d1b4ab

9 files changed

Lines changed: 24 additions & 3 deletions

changelog.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Template for new versions:
1919
# Future
2020

2121
## Structures
22+
- corrected return type on ``art_image_propertyst`` vmethod ``clone``
23+
2224

2325
# 53.13-r2
2426

df.art_image.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<vmethod ret-type='art_image_property_type' name='getType' original-name='type'/>
8989
<vmethod is-destructor='true'/>
9090
<vmethod name='clone' original-name='copy'>
91-
<ret-type><pointer type-name='art_image_element'/></ret-type>
91+
<ret-type><pointer type-name='art_image_property'/></ret-type>
9292
</vmethod>
9393

9494
<vmethod name='getName' original-name='get_string'>

df.creature.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,9 @@
708708
<int32_t name='use_standard_beast_palette_row'/>
709709

710710
<stl-string name='use_color_palette_token'/>
711+
712+
<int32_t name='offset_x'/>
713+
<int32_t name='offset_y'/>
711714
</struct-type>
712715

713716
<bitfield-type type-name='creature_graphics_layer_set_flag' base-type='uint64_t'> bay12: CREATURE_GRAPHICS_LAYER_SET_FLAG_*
@@ -727,6 +730,12 @@
727730
<bitfield base-type='uint64_t' type-name='creature_graphics_layer_set_flag' name='flags' original-name='flag'/>
728731

729732
<stl-vector pointer-type='cgl_bp_conditionst' name='lg_bp_condition'/>
733+
734+
<stl-string name='layer_set_template_token'/>
735+
<stl-unordered-map name='template_arg'>
736+
<key-type type-name='stl-string'/>
737+
<value-type type-name='stl-string'/>
738+
</stl-unordered-map>
730739
</struct-type>
731740

732741
<enum-type type-name='creature_small_texture_type' base-type='int32_t'> bay12: CreatureSmallTextureType
@@ -1456,6 +1465,7 @@
14561465
<enum-item name='HAS_ANY_SLOW_LEARNER'/>
14571466
<enum-item name='HAS_ANY_NIGHT_CREATURE_NIGHTMARE'/>
14581467
<enum-item name='HAS_ANY_NIGHT_CREATURE_EXPERIMENTER'/>
1468+
<enum-item name='HAS_REAL_WORLD_EXTINCT'/>
14591469
</enum-type>
14601470

14611471
-- Unused: CreatureDefStrings

df.d_interface.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6110,6 +6110,7 @@
61106110
<int32_t name='simple_site_cap'/>
61116111
<int32_t name='simple_beast'/>
61126112
<int32_t name='simple_savagery'/>
6113+
<int32_t name='simple_real_world_extinct'/>
61136114
<int32_t name='simple_minerals'/>
61146115

61156116
<int8_t name='abort_world_gen_dialogue'/>

df.g_src.music_and_sound_g.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<int32_t name='next_song_id'/>
103103
<int32_t name='next_sound_id'/>
104104

105-
<stl-unordered-map name='loaded_music' comment='unordered_map&lt;std::string, music_datast&gt;'>
105+
<stl-unordered-map name='loaded_music'>
106106
<key-type type-name='stl-string'/>
107107
<value-type type-name='music_datast'/>
108108
</stl-unordered-map>

df.g_src.texture_handler.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,15 @@
3737
<bool name='loaded'/>
3838
</struct-type>
3939

40+
<struct-type type-name='layer_set_templatest'>
41+
<stl-string name='token'/>
42+
<stl-vector pointer-type='stl-string' name='lines'/> actually textlinesst
43+
</struct-type>
44+
4045
<struct-type type-name='texture_handlerst'>
4146
<stl-vector pointer-type='tile_pagest' name='page'/>
4247
<stl-vector pointer-type='palette_pagest' name='palette'/>
48+
<stl-vector pointer-type='layer_set_templatest' name='layer_set_template'/>
4349
</struct-type>
4450
</data-definition>
4551

df.region.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@
167167
<int32_t name='all_caves_visible'/>
168168
<int32_t name='show_embark_tunnel'/>
169169
<int32_t name='pole' original-name='pole_type'/>
170+
<int32_t name='real_world_extinct'/>
170171

171172
<bool name='immune_to_resize'/>
172173
</struct-type>

df.widgets.unit_list.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<stl-function name='close_callback'/>
8080
<stl-vector type-name='unit_list_options' name='options'/>
8181
<stl-vector type-name='item_or_unit' name='entry_list'/>
82-
<stl-unordered-set name='selected' comment='std::unordered_set&lt;void *&gt;'>
82+
<stl-unordered-set name='selected'>
8383
<pointer/>
8484
</stl-unordered-set>
8585
<stl-unordered-map name='job_sort_str'>

df.world.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<stl-vector type-name='stl-fs-path' name='mod_folder_paths' original-name='object_load_order_src_dir'/>
169169
<stl-vector pointer-type='stl-string' name='mod_names' original-name='object_load_order_name'/>
170170
<stl-vector pointer-type='stl-string' name='mod_display_versions' original-name='object_load_order_displayed_version'/>
171+
<int32_t name='param_real_world_extinct'/>
171172
</struct-type>
172173

173174
<struct-type type-name='open_list_nodest'>

0 commit comments

Comments
 (0)