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.abstract_building.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@

<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod ret-type='int32_t' name='getReligionID' original-name='get_entity_id'/>
Expand Down
4 changes: 2 additions & 2 deletions df.activity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod ret-type='bool' name='isEmpty' original-name='is_bad'
Expand Down Expand Up @@ -834,7 +834,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
</virtual-methods>
</class-type>
Expand Down
4 changes: 2 additions & 2 deletions df.art_image.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod ret-type='art_image_element_type' name='getType' original-name='type'/>
<vmethod name='setID' original-name='set_subtype'> <int32_t name='st' comment='race, item type, plant ID, or shape ID'/> </vmethod>
Expand Down Expand Up @@ -83,7 +83,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod ret-type='art_image_property_type' name='getType' original-name='type'/>
<vmethod is-destructor='true'/>
Expand Down
6 changes: 3 additions & 3 deletions df.block.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod ret-type='bool' name='isEmpty' original-name='is_empty'/>
<vmethod is-destructor='true'/>
Expand Down Expand Up @@ -340,7 +340,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
</virtual-methods>
</class-type>
Expand All @@ -367,7 +367,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
</virtual-methods>
</class-type>
Expand Down
2 changes: 1 addition & 1 deletion df.building.xml
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod ret-type='bool' name='isImpassableAtCreation' original-name='perimdestroyer'
comment='the true set looks like things where the unit should stand aside'/>
Expand Down
2 changes: 1 addition & 1 deletion df.creation_zone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod name='apply_to_map'><pointer name='map' comment='map_generatorst'/></vmethod>
Expand Down
2 changes: 1 addition & 1 deletion df.d_interface.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6515,7 +6515,7 @@
<class-type type-name='viewscreen_adopt_regionst' inherits-from='viewscreen'>
<compound type-name='file_compressorst' name='compressor' original-name='filecomp'/>
<enum type-name='adopt_region_stage_type' name='cur_step' original-name='adopt_stage'/>
<enum type-name='save_version' name='save_version' original-name='loadversion'/>
<int32_t name='save_version' original-name='loadversion'/>
<compound type-name='region_headerst' name='cur_save' original-name='header'/>
<compound type-name='region_object_datast' name='rod'/>
<int32_t name='progress' original-name='stage_count' comment='0..35'/>
Expand Down
135 changes: 0 additions & 135 deletions df.dfhack.xml
Original file line number Diff line number Diff line change
Expand Up @@ -821,141 +821,6 @@
<enum-item name='Combat'/>
<enum-item name='Work'/>
</enum-type>

<enum-type type-name='cmv_version' base-type='int32_t'>
<enum-item name='CMV_0' value='10000'/>
<enum-item name='CMV_1' value='10001' comment='adds support for sound'/>
</enum-type>

<enum-type type-name='save_version' base-type='int32_t'>
<enum-item name='v0_21_93_19a' value='1107'/>
<enum-item name='v0_21_93_19c' value='1108'/>
<enum-item name='v0_21_95_19a' value='1108'/>
<enum-item name='v0_21_95_19b' value='1108'/>
<enum-item name='v0_21_95_19c' value='1110'/>
<enum-item name='v0_21_104_19d' value='1121'/>
<enum-item name='v0_21_104_21a' value='1123'/>
<enum-item name='v0_21_104_21b' value='1125'/>
<enum-item name='v0_21_105_21a' value='1128'/>
<enum-item name='v0_22_107_21a' value='1128'/>
<enum-item name='v0_22_110_22e' value='1134'/>
<enum-item name='v0_22_110_22f' value='1137'/>
<enum-item name='v0_22_110_23a' value='1148'/>
<enum-item name='v0_22_120_23a' value='1151'/>
<enum-item name='v0_22_121_23b' value='1161'/>
<enum-item name='v0_22_123_23a' value='1165'/>
<enum-item name='v0_23_130_23a' value='1169'/>

<enum-item name='v0_27_169_32a' value='1205'/>
<enum-item name='v0_27_169_33a' value='1206'/>
<enum-item name='v0_27_169_33b' value='1209'/>
<enum-item name='v0_27_169_33c' value='1211'/>
<enum-item name='v0_27_169_33d' value='1212'/>
<enum-item name='v0_28_181_39b' value='1255'/>
<enum-item name='v0_28_181_39c' value='1256'/>
<enum-item name='v0_28_181_39d' value='1259'/>
<enum-item name='v0_28_181_39e' value='1260'/>
<enum-item name='v0_28_181_39f' value='1261'/>
<enum-item name='v0_28_181_40a' value='1265'/>
<enum-item name='v0_28_181_40b' value='1266'/>
<enum-item name='v0_28_181_40c' value='1267'/>
<enum-item name='v0_28_181_40d' value='1268'/>

<enum-item name='v0_31_01' value='1287'/>
<enum-item name='v0_31_02' value='1288'/>
<enum-item name='v0_31_03' value='1289'/>
<enum-item name='v0_31_04' value='1292'/>
<enum-item name='v0_31_05' value='1295'/>
<enum-item name='v0_31_06' value='1297'/>
<enum-item name='v0_31_08' value='1300'/>
<enum-item name='v0_31_09' value='1304'/>
<enum-item name='v0_31_10' value='1305'/>
<enum-item name='v0_31_11' value='1310'/>
<enum-item name='v0_31_12' value='1311'/>
<enum-item name='v0_31_13' value='1323'/>
<enum-item name='v0_31_14' value='1325'/>
<enum-item name='v0_31_15' value='1326'/>
<enum-item name='v0_31_16' value='1327'/>
<enum-item name='v0_31_17' value='1340'/>
<enum-item name='v0_31_18' value='1341'/>
<enum-item name='v0_31_19' value='1351'/>
<enum-item name='v0_31_20' value='1353'/>
<enum-item name='v0_31_21' value='1354'/>
<enum-item name='v0_31_22' value='1359'/>
<enum-item name='v0_31_23' value='1360'/>
<enum-item name='v0_31_24' value='1361'/>
<enum-item name='v0_31_25' value='1362'/>

<enum-item name='v0_34_01' value='1372'/>
<enum-item name='v0_34_02' value='1374'/>
<enum-item name='v0_34_03' value='1376'/>
<enum-item name='v0_34_04' value='1377'/>
<enum-item name='v0_34_05' value='1378'/>
<enum-item name='v0_34_06' value='1382'/>
<enum-item name='v0_34_07' value='1383'/>
<enum-item name='v0_34_08' value='1400'/>
<enum-item name='v0_34_09' value='1402'/>
<enum-item name='v0_34_10' value='1403'/>
<enum-item name='v0_34_11' value='1404'/>

<enum-item name='v0_40_01' value='1441'/>
<enum-item name='v0_40_02' value='1442'/>
<enum-item name='v0_40_03' value='1443'/>
<enum-item name='v0_40_04' value='1444'/>
<enum-item name='v0_40_05' value='1445'/>
<enum-item name='v0_40_06' value='1446'/>
<enum-item name='v0_40_07' value='1448'/>
<enum-item name='v0_40_08' value='1449'/>
<enum-item name='v0_40_09' value='1451'/>
<enum-item name='v0_40_10' value='1452'/>
<enum-item name='v0_40_11' value='1456'/>
<enum-item name='v0_40_12' value='1459'/>
<enum-item name='v0_40_13' value='1462'/>
<enum-item name='v0_40_14' value='1469'/>
<enum-item name='v0_40_15' value='1470'/>
<enum-item name='v0_40_16' value='1471'/>
<enum-item name='v0_40_17' value='1472'/>
<enum-item name='v0_40_18' value='1473'/>
<enum-item name='v0_40_19' value='1474'/>
<enum-item name='v0_40_20' value='1477'/>
<enum-item name='v0_40_21' value='1478'/>
<enum-item name='v0_40_22' value='1479'/>
<enum-item name='v0_40_23' value='1480'/>
<enum-item name='v0_40_24' value='1481'/>

<enum-item name='v0_42_01' value='1531'/>
<enum-item name='v0_42_02' value='1532'/>
<enum-item name='v0_42_03' value='1533'/>
<enum-item name='v0_42_04' value='1534'/>
<enum-item name='v0_42_05' value='1537'/>
<enum-item name='v0_42_06' value='1542'/>

<enum-item name='v0_43_01' value='1551'/>
<enum-item name='v0_43_02' value='1552'/>
<enum-item name='v0_43_03' value='1553'/>
<enum-item name='v0_43_04' value='1555'/>
<enum-item name='v0_43_05' value='1556'/>

<enum-item name='v0_44_01' value='1596'/>
<enum-item name='v0_44_02' value='1597'/>
<enum-item name='v0_44_03' value='1600'/>
<enum-item name='v0_44_04' value='1603'/>
<enum-item name='v0_44_05' value='1604'/>
<enum-item name='v0_44_06' value='1611'/>
<enum-item name='v0_44_07' value='1612'/>
<enum-item name='v0_44_08' value='1613'/>
<enum-item name='v0_44_09' value='1614'/>
<enum-item name='v0_44_10' value='1620'/>
<enum-item name='v0_44_11' value='1623'/>
<enum-item name='v0_44_12' value='1625'/>

<enum-item name='v0_47_01' value='1710'/>
<enum-item name='v0_47_02' value='1711'/>
<enum-item name='v0_47_03' value='1713'/>
<enum-item name='v0_47_04' value='1715'/>
<enum-item name='v0_47_05' value='1716'/>
<!-- LAST_SAVE_VERSION (leave this comment here for automated updates) -->
</enum-type>
</data-definition>

<!--
Expand Down
2 changes: 1 addition & 1 deletion df.entity.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
</virtual-methods>
Expand Down
6 changes: 3 additions & 3 deletions df.feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
</virtual-methods>
Expand Down Expand Up @@ -99,7 +99,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='shiftCoords' original-name='shift_locations'><int16_t name='shiftx'/><int16_t name='shifty'/><int16_t name='shiftz'/></vmethod>
<vmethod name='discovery_realize' comment='originally used in 40d to populate demon pits'/>
Expand Down Expand Up @@ -160,7 +160,7 @@
</vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
<bool name='active_game'/>
</vmethod>
<vmethod name='createFeature' original-name='allocate_feature_for_load'>
Expand Down
2 changes: 1 addition & 1 deletion df.flow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='advance_flow'><pointer type-name='flow_info' name='ef'/></vmethod>
<vmethod is-destructor='true'/>
Expand Down
12 changes: 3 additions & 9 deletions df.game_v.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,10 @@

<global-object type-name='interfacest' name='gview'/>

<global-object name='version'>
<enum base-type='int32_t' type-name='save_version'/>
</global-object>
<global-object type-name='int32_t' name='version'/>

<global-object name='min_load_version'>
<enum base-type='int32_t' type-name='save_version'/>
</global-object>
<global-object name='movie_version'>
<enum base-type='int32_t' type-name='cmv_version'/>
</global-object>
<global-object type-name='int32_t' name='min_load_version'/>
<global-object type-name='int32_t' name='movie_version'/>
<global-object name='flows' original-name='event_flow'>
<stl-vector pointer-type='flow_info'/>
</global-object>
Expand Down
2 changes: 1 addition & 1 deletion df.history_collection.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='categorize' original-name='add_to_arrays'/>

Expand Down
2 changes: 1 addition & 1 deletion df.history_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='add_to_classes' comment='records event in historical_entity.diplomacy in both directions if applicable'/>
<vmethod is-destructor='true'/>
Expand Down
6 changes: 3 additions & 3 deletions df.history_figure.xml
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod ret-type='int32_t' name='getSquadId' original-name='get_squad_id'/>
<vmethod ret-type='int32_t' name='getSquadPosition' original-name='get_squad_position'/>
Expand Down Expand Up @@ -909,7 +909,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='generate_xml' original-name='xml_dump'>
<pointer type-name='stl-fstream' name='fseed'/>
Expand Down Expand Up @@ -951,7 +951,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod name='generate_xml' original-name='xml_dump'>
<pointer type-name='stl-fstream' name='fseed'/>
Expand Down
6 changes: 3 additions & 3 deletions df.interaction.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod ret-type='bool' name='parseRaws' original-name='adopt_line'>
Expand Down Expand Up @@ -149,7 +149,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod ret-type='bool' name='parseRaws' original-name='adopt_line'>
Expand Down Expand Up @@ -258,7 +258,7 @@
<vmethod name='write_file'> <pointer type-name='file_compressorst' name='filecomp'/> </vmethod>
<vmethod name='read_file'>
<pointer type-name='file_compressorst' name='filecomp'/>
<enum type-name='save_version' name='loadversion'/>
<int32_t name='loadversion'/>
</vmethod>
<vmethod is-destructor='true'/>
<vmethod name='activateOnUnit' original-name='apply_to_unit'>
Expand Down
Loading
Loading