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.

Sign up for GitHub

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

Jump to bottom

Allow vehicle tables to perform butchery #29177

Merged
merged 3 commits into from Apr 1, 2019
Merged

Allow vehicle tables to perform butchery #29177

merged 3 commits into from Apr 1, 2019

Conversation

ghost
Copy link

@ghost ghost commented Mar 31, 2019

Summary

SUMMARY: Bugfixes "Allow vehicle tables to perform butchery"

Purpose of change

FIxes #29010

Describe the solution

added FLAT_SURF vehicle part json flag.
checked for that vehicle flag in activity_handlers.cpp

Describe alternatives you've considered

N/A

Additional context

N/A

@Reclusive-reptile
Copy link
Contributor

"veh_table_wood" Should also get the flag.

@ghost
Copy link
Author

ghost commented Apr 1, 2019

"veh_table_wood" Should also get the flag.

Ah yeah thanks, forgot about that one

mlangsdorf
mlangsdorf suggested changes Apr 1, 2019
View reviewed changes
Copy link
Contributor

@mlangsdorf mlangsdorf left a comment

Choose a reason for hiding this comment

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

Do not make FLAT_SURF into a vpart_bitflag.

The rest looks sensible.

src/veh_type.h Outdated Show resolved Hide resolved
src/veh_type.cpp Outdated Show resolved Hide resolved
@mlangsdorf mlangsdorf added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Vehicles Vehicles, parts, mechanics & interactions [C++] Changes (can be) made in C++. Previously named `Code` labels Apr 1, 2019
@ZhilkinSerg ZhilkinSerg merged commit 75c5832 into CleverRaven:master Apr 1, 2019
@ghost ghost deleted the vehicle_butchery branch April 2, 2019 11:20
@wapcaplet wapcaplet mentioned this pull request Feb 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

check vehicle parts for butchering surface
3 participants
@Reclusive-reptile @mlangsdorf @ZhilkinSerg