Skip to content

Commit 0f9e05a

Browse files
ab9rfab9rf
authored
Merge pull request #874 from quietust/field_order
Reorder attributes for consistency
2 parents d792883 + 55cd9b7 commit 0f9e05a

120 files changed

Lines changed: 5481 additions & 5480 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎changelog.txt‎

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

2121
## Structures
22+
- reordered XML attributes for consistency: ``ret-type``, ``base-type``, ``type-name``, and ``pointer-type`` now appear first (and in that exact order)
2223

2324
# 53.11-r1
2425

‎df.abstract_building.xml‎

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

‎df.activity.xml‎

Lines changed: 139 additions & 139 deletions
Large diffs are not rendered by default.

‎df.activity_meeting.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<int32_t name='unit_actor' original-name='actor_unid' ref-target='unit' init-value='-1' comment='diplomat or worker'/>
1313
<int32_t name='unit_noble' original-name='target_unid' ref-target='unit' init-value='-1' comment='meeting recipient'/>
1414
<int32_t name='place' original-name='civzone_id' ref-target='building' init-value='-1'/>
15-
<bitfield base-type='int16_t' name='flags' original-name='flag' type-name='activity_flag'/>
15+
<bitfield base-type='int16_t' type-name='activity_flag' name='flags' original-name='flag'/>
1616
<int8_t name='worstroomrank' init-value='3'/>
1717
<int16_t name='delay' original-name='discusscount' init-value='0'/>
1818
<int32_t name='tree_quota' original-name='tempvalue' init-value='-1'/>

‎df.adventure.xml‎

Lines changed: 166 additions & 166 deletions
Large diffs are not rendered by default.

‎df.adventure_log.xml‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -17,72 +17,72 @@
1717

1818
<struct-type type-name='bestiary_entryst'>
1919
<int32_t name='alpha_index'/>
20-
<pointer name='ck' type-name='creature_knowledgest'/>
20+
<pointer type-name='creature_knowledgest' name='ck'/>
2121
<stl-string name='list_name'/>
2222

2323
<stl-string name='p_list_name'/>
24-
<compound name='main_text_box' type-name='curses_text_boxst'/>
24+
<compound type-name='curses_text_boxst' name='main_text_box'/>
2525
</struct-type>
2626

2727
<struct-type type-name='agreement_entryst'>
28-
<pointer name='ag' type-name='agreement'/>
28+
<pointer type-name='agreement' name='ag'/>
2929

30-
<pointer name='sq' type-name='squad'/>
31-
<pointer name='so' type-name='squad_order'/>
30+
<pointer type-name='squad' name='sq'/>
31+
<pointer type-name='squad_order' name='so'/>
3232
<bool name='squad_order_repeatable'/>
3333

3434
<stl-string name='list_name'/>
3535
<stl-string name='simple_list_name'/>
3636

3737
<stl-string name='p_list_name'/>
38-
<compound name='main_text_box' type-name='curses_text_boxst'/>
38+
<compound type-name='curses_text_boxst' name='main_text_box'/>
3939

4040
<bool name='showing_commander'/>
4141
<int32_t name='ax'/>
4242
<int32_t name='ay'/>
4343
</struct-type>
4444

4545
<struct-type type-name='histfig_entryst'>
46-
<pointer name='hf' type-name='historical_figure'/>
46+
<pointer type-name='historical_figure' name='hf'/>
4747
<stl-string name='list_name'/>
4848
<stl-string name='simple_list_name'/>
4949

5050
<stl-string name='p_list_name'/>
51-
<compound name='main_text_box' type-name='curses_text_boxst'/>
51+
<compound type-name='curses_text_boxst' name='main_text_box'/>
5252

53-
<pointer name='iden' type-name='identity'/>
53+
<pointer type-name='identity' name='iden'/>
5454
<int32_t name='value'/>
5555
</struct-type>
5656

5757
<struct-type type-name='site_entryst'>
58-
<pointer name='st' type-name='world_site'/>
58+
<pointer type-name='world_site' name='st'/>
5959
<stl-string name='list_name'/>
6060
<stl-string name='simple_list_name'/>
6161

6262
<stl-string name='p_list_name'/>
63-
<compound name='main_text_box' type-name='curses_text_boxst'/>
63+
<compound type-name='curses_text_boxst' name='main_text_box'/>
6464

6565
<int32_t name='value'/>
6666
</struct-type>
6767

6868
<struct-type type-name='entity_entryst'>
69-
<pointer name='ent' type-name='historical_entity'/>
69+
<pointer type-name='historical_entity' name='ent'/>
7070
<stl-string name='list_name'/>
7171
<stl-string name='simple_list_name'/>
7272

7373
<stl-string name='p_list_name'/>
74-
<compound name='main_text_box' type-name='curses_text_boxst'/>
74+
<compound type-name='curses_text_boxst' name='main_text_box'/>
7575

7676
<int32_t name='value'/>
7777
</struct-type>
7878

7979
<struct-type type-name='subregion_entryst'>
80-
<pointer name='sr' type-name='world_region'/>
80+
<pointer type-name='world_region' name='sr'/>
8181
<stl-string name='list_name'/>
8282
<stl-string name='simple_list_name'/>
8383

8484
<stl-string name='p_list_name'/>
85-
<compound name='main_text_box' type-name='curses_text_boxst'/>
85+
<compound type-name='curses_text_boxst' name='main_text_box'/>
8686
</struct-type>
8787

8888
<enum-type type-name='adventure_log_event_type' base-type='int32_t'> bay12: AdventureLogEventType
@@ -92,22 +92,22 @@
9292
</enum-type>
9393

9494
<struct-type type-name='adventure_log_eventst'>
95-
<enum name='type' type-name='adventure_log_event_type'/>
96-
<pointer name='rumor' type-name='entity_event'/>
97-
<pointer name='incident' type-name='incident'/>
98-
<pointer name='ard' type-name='adventure_rumor_datast'/>
95+
<enum type-name='adventure_log_event_type' name='type'/>
96+
<pointer type-name='entity_event' name='rumor'/>
97+
<pointer type-name='incident' name='incident'/>
98+
<pointer type-name='adventure_rumor_datast' name='ard'/>
9999
<int32_t name='year'/>
100100
<int32_t name='season_count'/>
101101

102102
<stl-string name='list_name'/>
103103
<stl-string name='simple_list_name'/>
104104

105105
<stl-string name='summary'/>
106-
<stl-vector name='key_word' pointer-type='stl-string'/>
106+
<stl-vector pointer-type='stl-string' name='key_word'/>
107107

108108
<stl-string name='p_list_name'/>
109-
<compound name='p_list_box' type-name='curses_text_boxst'/>
110-
<compound name='main_text_box' type-name='curses_text_boxst'/>
109+
<compound type-name='curses_text_boxst' name='p_list_box'/>
110+
<compound type-name='curses_text_boxst' name='main_text_box'/>
111111

112112
<int32_t name='ax' init-value='-1'/>
113113
<int32_t name='ay' init-value='-1'/>
@@ -116,14 +116,14 @@
116116
</struct-type>
117117

118118
<struct-type type-name='artifact_entryst'>
119-
<pointer name='art' type-name='artifact_record'/>
119+
<pointer type-name='artifact_record' name='art'/>
120120
<stl-string name='list_name'/>
121121
<stl-string name='simple_list_name'/>
122122

123123
<stl-string name='p_list_name'/>
124-
<compound name='main_text_box' type-name='curses_text_boxst'/>
124+
<compound type-name='curses_text_boxst' name='main_text_box'/>
125125

126-
<compound name='arl' type-name='artifact_rumor_locationst'/>
126+
<compound type-name='artifact_rumor_locationst' name='arl'/>
127127

128128
<int32_t name='ax'/>
129129
<int32_t name='ay'/>
@@ -150,18 +150,18 @@
150150
</enum-type>
151151

152152
<class-type type-name='viewscreen_adventure_logst' inherits-from='viewscreen'>
153-
<stl-vector name='base_actor_entry' pointer-type='actor_entryst'/>
154-
<stl-vector name='base_organization_entry' pointer-type='organization_entryst'/>
155-
<stl-vector name='base_plot_entry' pointer-type='plot_entryst'/>
156-
<compound name='evidence_repository' type-name='evidence_repositoryst'/>
153+
<stl-vector pointer-type='actor_entryst' name='base_actor_entry'/>
154+
<stl-vector pointer-type='organization_entryst' name='base_organization_entry'/>
155+
<stl-vector pointer-type='plot_entryst' name='base_plot_entry'/>
156+
<compound type-name='evidence_repositoryst' name='evidence_repository'/>
157157

158-
<compound name='map_display' type-name='adventure_log_map_displayst'/>
158+
<compound type-name='adventure_log_map_displayst' name='map_display'/>
159159

160160
<int32_t name="selected"/>
161161
<int8_t name="line_on"/>
162-
<enum name='mode' type-name='adventure_log_mode'/>
163-
<enum name='submode' type-name='adventure_log_mode'/>
164-
<enum name='saved_submode_intrigue' type-name='adventure_log_mode'/>
162+
<enum type-name='adventure_log_mode' name='mode'/>
163+
<enum type-name='adventure_log_mode' name='submode'/>
164+
<enum type-name='adventure_log_mode' name='saved_submode_intrigue'/>
165165
<int32_t name='adventure_log_event_text_scroll'/>
166166
<int32_t name='histfig_text_scroll'/>
167167
<int32_t name='bestiary_text_scroll'/>
@@ -171,7 +171,7 @@
171171
<int32_t name='artifact_text_scroll'/>
172172

173173
<bool name='expand_text'/>
174-
<pointer name='selected_oen' type-name='organization_entry_nodest'/>
174+
<pointer type-name='organization_entry_nodest' name='selected_oen'/>
175175

176176
<stl-string name='filter_str'/>
177177
<bool name='entering_filter'/>
@@ -191,15 +191,15 @@
191191
<int32_t name='scroll_position_intrigue_plots'/>
192192
<bool name='scrolling'/>
193193

194-
<stl-vector name='base_site_entry' pointer-type='site_entryst'/>
195-
<stl-vector name='base_entity_entry' pointer-type='entity_entryst'/>
196-
<stl-vector name='base_subregion_entry' pointer-type='subregion_entryst'/>
197-
<stl-vector name='base_feature_layer' pointer-type='world_underground_region'/>
198-
<stl-vector name='base_agreement_entry' pointer-type='agreement_entryst'/>
199-
<stl-vector name='base_bestiary_entry' pointer-type='bestiary_entryst'/>
200-
<stl-vector name='base_adventure_log_event' pointer-type='adventure_log_eventst'/>
201-
<stl-vector name='base_histfig_entry' pointer-type='histfig_entryst'/>
202-
<stl-vector name='base_artifact_entry' pointer-type='artifact_entryst'/>
194+
<stl-vector pointer-type='site_entryst' name='base_site_entry'/>
195+
<stl-vector pointer-type='entity_entryst' name='base_entity_entry'/>
196+
<stl-vector pointer-type='subregion_entryst' name='base_subregion_entry'/>
197+
<stl-vector pointer-type='world_underground_region' name='base_feature_layer'/>
198+
<stl-vector pointer-type='agreement_entryst' name='base_agreement_entry'/>
199+
<stl-vector pointer-type='bestiary_entryst' name='base_bestiary_entry'/>
200+
<stl-vector pointer-type='adventure_log_eventst' name='base_adventure_log_event'/>
201+
<stl-vector pointer-type='histfig_entryst' name='base_histfig_entry'/>
202+
<stl-vector pointer-type='artifact_entryst' name='base_artifact_entry'/>
203203

204204
<bool name='priority_sort_site'/>
205205
<bool name='priority_sort_entity'/>
@@ -209,31 +209,31 @@
209209
<bool name='set_priority_entity'/>
210210
<bool name='set_priority_histfig'/>
211211
<bool name='set_priority_event'/>
212-
<stl-vector name='value_site_entry' pointer-type='site_entryst'/>
213-
<stl-vector name='value_entity_entry' pointer-type='entity_entryst'/>
214-
<stl-vector name='value_subregion_entry' pointer-type='subregion_entryst'/>
215-
<stl-vector name='value_feature_layer' pointer-type='world_underground_region'/>
216-
<stl-vector name='value_agreement_entry' pointer-type='agreement_entryst'/>
217-
<stl-vector name='value_bestiary_entry' pointer-type='bestiary_entryst'/>
218-
<stl-vector name='value_adventure_log_event' pointer-type='adventure_log_eventst'/>
219-
<stl-vector name='value_histfig_entry' pointer-type='histfig_entryst'/>
220-
<stl-vector name='value_artifact_entry' pointer-type='artifact_entryst'/>
221-
<stl-vector name='value_actor_entry' pointer-type='actor_entryst'/>
222-
<stl-vector name='value_organization_entry' pointer-type='organization_entryst'/>
223-
<stl-vector name='value_plot_entry' pointer-type='plot_entryst'/>
224-
225-
<stl-vector name='site_entry' pointer-type='site_entryst'/>
226-
<stl-vector name='entity_entry' pointer-type='entity_entryst'/>
227-
<stl-vector name='subregion_entry' pointer-type='subregion_entryst'/>
228-
<stl-vector name='feature_layer' pointer-type='world_underground_region'/>
229-
<stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
230-
<stl-vector name='bestiary_entry' pointer-type='bestiary_entryst'/>
231-
<stl-vector name='adventure_log_event' pointer-type='adventure_log_eventst'/>
232-
<stl-vector name='histfig_entry' pointer-type='histfig_entryst'/>
233-
<stl-vector name='artifact_entry' pointer-type='artifact_entryst'/>
234-
<stl-vector name='actor_entry' pointer-type='actor_entryst'/>
235-
<stl-vector name='organization_entry' pointer-type='organization_entryst'/>
236-
<stl-vector name='plot_entry' pointer-type='plot_entryst'/>
212+
<stl-vector pointer-type='site_entryst' name='value_site_entry'/>
213+
<stl-vector pointer-type='entity_entryst' name='value_entity_entry'/>
214+
<stl-vector pointer-type='subregion_entryst' name='value_subregion_entry'/>
215+
<stl-vector pointer-type='world_underground_region' name='value_feature_layer'/>
216+
<stl-vector pointer-type='agreement_entryst' name='value_agreement_entry'/>
217+
<stl-vector pointer-type='bestiary_entryst' name='value_bestiary_entry'/>
218+
<stl-vector pointer-type='adventure_log_eventst' name='value_adventure_log_event'/>
219+
<stl-vector pointer-type='histfig_entryst' name='value_histfig_entry'/>
220+
<stl-vector pointer-type='artifact_entryst' name='value_artifact_entry'/>
221+
<stl-vector pointer-type='actor_entryst' name='value_actor_entry'/>
222+
<stl-vector pointer-type='organization_entryst' name='value_organization_entry'/>
223+
<stl-vector pointer-type='plot_entryst' name='value_plot_entry'/>
224+
225+
<stl-vector pointer-type='site_entryst' name='site_entry'/>
226+
<stl-vector pointer-type='entity_entryst' name='entity_entry'/>
227+
<stl-vector pointer-type='subregion_entryst' name='subregion_entry'/>
228+
<stl-vector pointer-type='world_underground_region' name='feature_layer'/>
229+
<stl-vector pointer-type='agreement_entryst' name='agreement_entry'/>
230+
<stl-vector pointer-type='bestiary_entryst' name='bestiary_entry'/>
231+
<stl-vector pointer-type='adventure_log_eventst' name='adventure_log_event'/>
232+
<stl-vector pointer-type='histfig_entryst' name='histfig_entry'/>
233+
<stl-vector pointer-type='artifact_entryst' name='artifact_entry'/>
234+
<stl-vector pointer-type='actor_entryst' name='actor_entry'/>
235+
<stl-vector pointer-type='organization_entryst' name='organization_entry'/>
236+
<stl-vector pointer-type='plot_entryst' name='plot_entry'/>
237237
</class-type>
238238
</data-definition>
239239

0 commit comments

Comments
 (0)