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: 1 addition & 1 deletion df.d_init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
count='356' index-enum='announcement_type'/>
</struct-type>

<struct-type type-name='d_init'>
<struct-type type-name='d_init' original-name='d_initst'>
<compound name='display' type-name='d_init_displayst'/>
<compound name='adventure' type-name='d_init_adventurest'/>
<compound name='dwarf' type-name='d_init_dwarfst'/>
Expand Down
2 changes: 1 addition & 1 deletion df.event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<enum-item name='FromColony'/>
</enum-type>

<struct-type type-name='vermin' instance-vector='$global.world.event.vermin'>
<struct-type type-name='vermin' original-name='event_verminst' instance-vector='$global.world.event.vermin'>
<int16_t name='race' ref-target='creature_raw'/>
<int16_t name='caste' ref-target='caste_raw' aux-value='$$.race'/>
<compound name='pos' type-name='coord'/>
Expand Down
2 changes: 1 addition & 1 deletion df.history_figure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<flag-bit name='gelded'/>
</bitfield-type>

<struct-type type-name="body_profilest"> bay12: body_profilest
<struct-type type-name="body_profilest">
<stl-vector name="events" type-name='int32_t' ref-target='history_event'/>
<stl-bit-vector name="status" comment='missing body parts'>
<code-helper name='index-refers-to'>
Expand Down
12 changes: 7 additions & 5 deletions df.rhythm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@
<bitfield name='flags' base-type='uint32_t' type-name='rhythm_construction_flag'/>
</struct-type>

<struct-type type-name='rhythm' instance-vector='$global.world.rhythms.all' key-field='id'>
<bitfield-type type-name='rhythm_flag' base-type='uint32_t'> bay12: RHYTHM_FLAG_*
<flag-bit name='fundamental_polyrhythm'/>
<flag-bit name='fundamental_polymeter'/>
</bitfield-type>

<struct-type type-name='rhythm' original-name='rhythmst' instance-vector='$global.world.rhythms.all' key-field='id'>
<int32_t name='id'/>
<stl-vector name='patterns' pointer-type='rhythm_pattern'/>
<stl-vector name='sub_rhythms' pointer-type='sub_rhythm'/>
<bitfield name='flags' base-type='uint32_t'> bay12: RHYTHM_FLAG_*
<flag-bit name='fundamental_polyrhythm'/>
<flag-bit name='fundamental_polymeter'/>
</bitfield>
<bitfield name='flags' base-type='uint32_t' type-name='rhythm_flag'/>
</struct-type>

<struct-type type-name='rhythm_handlerst'>
Expand Down
2 changes: 1 addition & 1 deletion df.scale.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<flag-bit name='tonic_note_fixed_at_performance' comment='moveable_tonic'/>
</bitfield-type>

<struct-type type-name='scale' instance-vector='$global.world.scales.all' key-field='id'>
<struct-type type-name='scale' original-name='scalest' instance-vector='$global.world.scales.all' key-field='id'>
<int32_t name='id'/>
<bitfield name='flags' base-type='uint32_t' type-name='scale_flag'/>
<enum name='type' type-name='scale_type' base-type='int32_t'/>
Expand Down
2 changes: 1 addition & 1 deletion df.unit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2412,7 +2412,7 @@
<stl-vector name='own_interaction_delay' type-name='int32_t' since='v0.34.01'/>
</struct-type>

<struct-type type-name='unit_appearance' comment='physical_formst'>
<struct-type type-name='unit_appearance' original-name='physical_formst'>
<int32_t name='local_id'/>
<int32_t name='caste_index' refers-to='$global.world.raws.creatures.list_creature[$]' comment='also refers to $global.world.raws.creatures.list_caste[$]'/>
<int16_t name='favoredgrasp_bp'/>
Expand Down
Loading