Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ Template for new versions:
# Future

## Structures
- corrected return type on ``art_image_propertyst`` vmethod ``clone``


# 53.13-r2

Expand Down
2 changes: 1 addition & 1 deletion df.art_image.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<vmethod ret-type='art_image_property_type' name='getType' original-name='type'/>
<vmethod is-destructor='true'/>
<vmethod name='clone' original-name='copy'>
<ret-type><pointer type-name='art_image_element'/></ret-type>
<ret-type><pointer type-name='art_image_property'/></ret-type>
</vmethod>

<vmethod name='getName' original-name='get_string'>
Expand Down
10 changes: 10 additions & 0 deletions df.creature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,9 @@
<int32_t name='use_standard_beast_palette_row'/>

<stl-string name='use_color_palette_token'/>

<int32_t name='offset_x'/>
<int32_t name='offset_y'/>
</struct-type>

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

<stl-vector pointer-type='cgl_bp_conditionst' name='lg_bp_condition'/>

<stl-string name='layer_set_template_token'/>
<stl-unordered-map name='template_arg'>
<key-type type-name='stl-string'/>
<value-type type-name='stl-string'/>
</stl-unordered-map>
</struct-type>

<enum-type type-name='creature_small_texture_type' base-type='int32_t'> bay12: CreatureSmallTextureType
Expand Down Expand Up @@ -1456,6 +1465,7 @@
<enum-item name='HAS_ANY_SLOW_LEARNER'/>
<enum-item name='HAS_ANY_NIGHT_CREATURE_NIGHTMARE'/>
<enum-item name='HAS_ANY_NIGHT_CREATURE_EXPERIMENTER'/>
<enum-item name='HAS_REAL_WORLD_EXTINCT'/>
</enum-type>

-- Unused: CreatureDefStrings
Expand Down
1 change: 1 addition & 0 deletions df.d_interface.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6110,6 +6110,7 @@
<int32_t name='simple_site_cap'/>
<int32_t name='simple_beast'/>
<int32_t name='simple_savagery'/>
<int32_t name='simple_real_world_extinct'/>
<int32_t name='simple_minerals'/>

<int8_t name='abort_world_gen_dialogue'/>
Expand Down
2 changes: 1 addition & 1 deletion df.g_src.music_and_sound_g.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<int32_t name='next_song_id'/>
<int32_t name='next_sound_id'/>

<stl-unordered-map name='loaded_music' comment='unordered_map&lt;std::string, music_datast&gt;'>
<stl-unordered-map name='loaded_music'>
<key-type type-name='stl-string'/>
<value-type type-name='music_datast'/>
</stl-unordered-map>
Expand Down
6 changes: 6 additions & 0 deletions df.g_src.texture_handler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@
<bool name='loaded'/>
</struct-type>

<struct-type type-name='layer_set_templatest'>
<stl-string name='token'/>
<stl-vector pointer-type='stl-string' name='lines'/> actually textlinesst
</struct-type>

<struct-type type-name='texture_handlerst'>
<stl-vector pointer-type='tile_pagest' name='page'/>
<stl-vector pointer-type='palette_pagest' name='palette'/>
<stl-vector pointer-type='layer_set_templatest' name='layer_set_template'/>
</struct-type>
</data-definition>

Expand Down
1 change: 1 addition & 0 deletions df.region.xml
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
<int32_t name='all_caves_visible'/>
<int32_t name='show_embark_tunnel'/>
<int32_t name='pole' original-name='pole_type'/>
<int32_t name='real_world_extinct'/>

<bool name='immune_to_resize'/>
</struct-type>
Expand Down
2 changes: 1 addition & 1 deletion df.widgets.unit_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<stl-function name='close_callback'/>
<stl-vector type-name='unit_list_options' name='options'/>
<stl-vector type-name='item_or_unit' name='entry_list'/>
<stl-unordered-set name='selected' comment='std::unordered_set&lt;void *&gt;'>
<stl-unordered-set name='selected'>
<pointer/>
</stl-unordered-set>
<stl-unordered-map name='job_sort_str'>
Expand Down
1 change: 1 addition & 0 deletions df.world.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<stl-vector type-name='stl-fs-path' name='mod_folder_paths' original-name='object_load_order_src_dir'/>
<stl-vector pointer-type='stl-string' name='mod_names' original-name='object_load_order_name'/>
<stl-vector pointer-type='stl-string' name='mod_display_versions' original-name='object_load_order_displayed_version'/>
<int32_t name='param_real_world_extinct'/>
</struct-type>

<struct-type type-name='open_list_nodest'>
Expand Down
Loading