Skip to content

Commit fb88690

Browse files
authored
Merge pull request #841 from quietust/master
Update structures for 52.02
2 parents d2ebbc9 + 85c7661 commit fb88690

4 files changed

Lines changed: 16 additions & 13 deletions

File tree

df.d_interface.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5993,23 +5993,23 @@
59935993
<stl-vector pointer-type='stl-string' name='base_available_id'/>
59945994
<stl-vector type-name='int32_t' name='base_available_numeric_version'/>
59955995
<stl-vector type-name='int32_t' name='base_available_earliest_compat_numeric_version'/>
5996-
<stl-vector pointer-type='stl-string' name='base_available_src_dir'/>
5996+
<stl-vector type-name='stl-fs-path' name='base_available_src_dir'/>
59975997
<stl-vector pointer-type='stl-string' name='base_available_name'/>
59985998
<stl-vector pointer-type='stl-string' name='base_available_displayed_version'/>
59995999
<stl-vector pointer-type='mod_headerst' name='base_available_mod_header'/>
60006000

60016001
<stl-vector pointer-type='stl-string' name='object_load_order_id'/>
60026002
<stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
60036003
<stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
6004-
<stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
6004+
<stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
60056005
<stl-vector pointer-type='stl-string' name='object_load_order_name'/>
60066006
<stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
60076007
<stl-vector pointer-type='mod_headerst' name='object_load_order_mod_header'/>
60086008

60096009
<stl-vector pointer-type='stl-string' name='available_id'/>
60106010
<stl-vector type-name='int32_t' name='available_numeric_version'/>
60116011
<stl-vector type-name='int32_t' name='available_earliest_compat_numeric_version'/>
6012-
<stl-vector pointer-type='stl-string' name='available_src_dir'/>
6012+
<stl-vector type-name='stl-fs-path' name='available_src_dir'/>
60136013
<stl-vector pointer-type='stl-string' name='available_name'/>
60146014
<stl-vector pointer-type='stl-string' name='available_displayed_version'/>
60156015
<stl-vector pointer-type='mod_headerst' name='available_mod_header'/>
@@ -6040,23 +6040,23 @@
60406040
<stl-vector pointer-type='stl-string' name='base_available_id'/>
60416041
<stl-vector type-name='int32_t' name='base_available_numeric_version'/>
60426042
<stl-vector type-name='int32_t' name='base_available_earliest_compat_numeric_version'/>
6043-
<stl-vector pointer-type='stl-string' name='base_available_src_dir'/>
6043+
<stl-vector type-name='stl-fs-path' name='base_available_src_dir'/>
60446044
<stl-vector pointer-type='stl-string' name='base_available_name'/>
60456045
<stl-vector pointer-type='stl-string' name='base_available_displayed_version'/>
60466046
<stl-vector pointer-type='mod_headerst' name='base_available_mod_header'/>
60476047

60486048
<stl-vector pointer-type='stl-string' name='object_load_order_id'/>
60496049
<stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
60506050
<stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
6051-
<stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
6051+
<stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
60526052
<stl-vector pointer-type='stl-string' name='object_load_order_name'/>
60536053
<stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
60546054
<stl-vector pointer-type='mod_headerst' name='object_load_order_mod_header'/>
60556055

60566056
<stl-vector pointer-type='stl-string' name='available_id'/>
60576057
<stl-vector type-name='int32_t' name='available_numeric_version'/>
60586058
<stl-vector type-name='int32_t' name='available_earliest_compat_numeric_version'/>
6059-
<stl-vector pointer-type='stl-string' name='available_src_dir'/>
6059+
<stl-vector type-name='stl-fs-path' name='available_src_dir'/>
60606060
<stl-vector pointer-type='stl-string' name='available_name'/>
60616061
<stl-vector pointer-type='stl-string' name='available_displayed_version'/>
60626062
<stl-vector pointer-type='mod_headerst' name='available_mod_header'/>

df.g_src.files.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<data-definition>
2+
-- Unused: filest
3+
24
<struct-type type-name='file_compressorst' custom-methods='true'>
35
Note: the assign operator is manually implemented
46

df.g_src.texture_handler.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<struct-type type-name='palette_pagest' key-field='token'>
77
<stl-string name='token'/>
8-
<stl-string name='graphics_dir'/>
9-
<stl-string name='filename'/>
8+
<stl-fs-path name='graphics_dir'/>
9+
<stl-fs-path name='filename'/>
1010

1111
<int32_t name='default_row'/>
1212
<stl-vector name='color_token' pointer-type='stl-string'/>
@@ -17,8 +17,8 @@
1717

1818
<struct-type type-name='tile_pagest' key-field='token'>
1919
<stl-string name='token'/>
20-
<stl-string name='graphics_dir'/>
21-
<stl-string name='filename'/>
20+
<stl-fs-path name='graphics_dir'/>
21+
<stl-fs-path name='filename'/>
2222

2323
<int16_t name='tile_dim_x'/>
2424
<int16_t name='tile_dim_y'/>

df.world.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,11 @@
151151
<stl-vector name='text_sets' pointer-type='stl-string'/>
152152
<stl-vector name='musics' pointer-type='stl-string'/>
153153
<stl-vector name='sounds' pointer-type='stl-string'/>
154+
154155
<stl-vector name='mod_ids' pointer-type='stl-string'/>
155156
<stl-vector name='mod_versions' type-name='int32_t'/>
156157
<stl-vector name='mod_compatible_versions' type-name='int32_t'/>
157-
<stl-vector name='mod_folder_paths' pointer-type='stl-string'/>
158+
<stl-vector name='mod_folder_paths' type-name='stl-fs-path'/>
158159
<stl-vector name='mod_names' pointer-type='stl-string'/>
159160
<stl-vector name='mod_display_versions' pointer-type='stl-string'/>
160161
</struct-type>
@@ -328,8 +329,8 @@
328329
<stl-vector pointer-type='stl-string' name='object_load_order_id'/>
329330
<stl-vector type-name='int32_t' name='object_load_order_numeric_version'/>
330331
<stl-vector type-name='int32_t' name='object_load_order_earliest_compat_numeric_version'/>
331-
<stl-vector pointer-type='stl-string' name='object_load_order_src_dir'/>
332-
<stl-string name='src_dir'/>
332+
<stl-vector type-name='stl-fs-path' name='object_load_order_src_dir'/>
333+
<stl-fs-path name='src_dir'/>
333334
<stl-vector pointer-type='stl-string' name='object_load_order_name'/>
334335
<stl-vector pointer-type='stl-string' name='object_load_order_displayed_version'/>
335336
</struct-type>

0 commit comments

Comments
 (0)