-
Notifications
You must be signed in to change notification settings - Fork 81
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
Conversation
5a1ceaf
to
131043a
Compare
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.
This is an automated comment. Please leave a reply if you think that the above information is incorrect. |
365a662
to
c8380e7
Compare
Also revert previous change to "identity"
df.item-vectors.xml
Outdated
@@ -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'/> |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
Note that there are multiple breaking changes in this update:
massst
, which will also be used incaravan_state
once I get to thatspatter
now includesspatter_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 toitemst::fitsCivRequestTab
itemst::addWear
oritemst::checkWearDestroy
should be checked, as their parameters were out of orderitemst::getItemDescriptionPrefix
now uses an enum for its second parameteritem_history_info
previously expected a pointer-to-pointer; now there's an actual structure in betweenLEAF_MAT
will finally need to be updated to useSTOCKPILE_PLANT_GROWTH
, and the same for theorganic_mat_category
values "Leaf" and "CookableLeaf"plant_flags
bitfield (watery/shrub) has been changed into theplant_type
enum, regardless of how closely the current enum values resemble bitflagsplant_tree_info
had itsextent_*
fields named incorrectly (east/south/west/north, where Toady had sx/ex/sy/ey) - anything which actually used them should be checked for correctness