Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync item/material structures to Toady headers #772

Merged
merged 2 commits into from
Jun 2, 2024

Conversation

quietust
Copy link
Member

@quietust quietust commented Jun 1, 2024

Note that there are multiple breaking changes in this update:

  • Item weight is now massst, which will also be used in caravan_state once I get to that
  • spatter now includes spatter_common as a member rather than inheriting from it (so that we won't need padding hacks anymore for GCC)
  • itemst::testMaterialFlag was wrong and has been changed to itemst::fitsCivRequestTab
  • Any call sites for itemst::addWear or itemst::checkWearDestroy should be checked, as their parameters were out of order
  • itemst::getItemDescriptionPrefix now uses an enum for its second parameter
  • Anything looking at item_history_info previously expected a pointer-to-pointer; now there's an actual structure in between
  • Anything still looking for the material flag LEAF_MAT will finally need to be updated to use STOCKPILE_PLANT_GROWTH, and the same for the organic_mat_category values "Leaf" and "CookableLeaf"
  • Enough is enough - the plant_flags bitfield (watery/shrub) has been changed into the plant_type enum, regardless of how closely the current enum values resemble bitflags
  • plant_tree_info had its extent_* fields named incorrectly (east/south/west/north, where Toady had sx/ex/sy/ey) - anything which actually used them should be checked for correctness

@quietust quietust force-pushed the master branch 2 times, most recently from 5a1ceaf to 131043a Compare June 1, 2024 20:15
Copy link
Contributor

github-actions bot commented Jun 1, 2024

The sizes of the following types have changed in this pull request. Please verify that this is intentional. Note that renamed types are not currently detected and will also be listed here.

Type Platform Previous size New size (this PR) Change
article_type linux64 0 4 +4
article_type windows64 0 4 +4
builtin_mats linux64 4 2 -2
builtin_mats windows64 4 2 -2
clothing_layer_type linux64 0 4 +4
clothing_layer_type windows64 0 4 +4
corpse_material_type linux64 4 2 -2
corpse_material_type windows64 4 2 -2
creature_interaction_effect_cure_infectionsst linux64 232 0 -232
creature_interaction_effect_cure_infectionsst windows64 232 0 -232
creature_interaction_effect_type linux64 4 2 -2
creature_interaction_effect_type windows64 4 2 -2
creature_interactionst linux64 0 24 +24
creature_interactionst windows64 0 24 +24
environment_type linux64 2 4 +2
environment_type windows64 2 4 +2
glove_handedness linux64 0 4 +4
glove_handedness windows64 0 4 +4
inclusion_type linux64 2 4 +2
inclusion_type windows64 2 4 +2
interaction_effect_type linux64 4 2 -2
interaction_effect_type windows64 4 2 -2
interaction_source_type linux64 4 2 -2
interaction_source_type windows64 4 2 -2
interaction_target_type linux64 4 2 -2
interaction_target_type windows64 4 2 -2
intermittent_frequency_type linux64 0 4 +4
intermittent_frequency_type windows64 0 4 +4
item_corpsest linux64 928 920 -8
item_liquid linux64 192 184 -8
item_liquid windows64 192 184 -8
item_magicalst linux64 0 24 +24
item_magicalst windows64 0 24 +24
item_magicness_type linux64 2 4 +2
item_magicness_type windows64 2 4 +2
item_matstate linux64 4 0 -4
item_matstate windows64 4 0 -4
item_powder linux64 192 184 -8
item_powder windows64 192 184 -8
item_profilest linux64 0 8 +8
item_profilest windows64 0 8 +8
itemdef_type linux64 0 4 +4
itemdef_type windows64 0 4 +4
massst linux64 0 8 +8
massst windows64 0 8 +8
material_common linux64 1216 1240 +24
material_common windows64 1216 1240 +24
material_template windows64 1520 1528 +8
meat_category_type linux64 0 4 +4
meat_category_type windows64 0 4 +4
organic_mat_category linux64 4 2 -2
organic_mat_category windows64 4 2 -2
plant_flags linux64 2 0 -2
plant_flags windows64 2 0 -2
plant_type linux64 0 4 +4
plant_type windows64 0 4 +4
strain_type linux64 4 2 -2
strain_type windows64 4 2 -2
writing_role_type linux64 0 4 +4
writing_role_type windows64 0 4 +4
writing_style_modifier_type linux64 0 4 +4
writing_style_modifier_type windows64 0 4 +4

This is an automated comment. Please leave a reply if you think that the above information is incorrect.

@quietust quietust force-pushed the master branch 3 times, most recently from 365a662 to c8380e7 Compare June 1, 2024 20:52
Also revert previous change to "identity"
@@ -712,7 +710,7 @@

<enum-item name='ANY_RECENTLY_DROPPED'/>
<enum-item name='ANY_MELT_DESIGNATED'/>
<enum-item/>
<enum-item comment='TEMP_SAVEi, should never actually be used'/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that last i supposed to be there?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that was a minor typo.

df.item-vectors.xml Outdated Show resolved Hide resolved
@myk002 myk002 merged commit 7c534f5 into DFHack:master Jun 2, 2024
4 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants