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

Store reload_option::moves earlier #61046

Merged
merged 1 commit into from
Sep 17, 2022
Merged

Store reload_option::moves earlier #61046

merged 1 commit into from
Sep 17, 2022

Conversation

irwiss
Copy link
Contributor

@irwiss irwiss commented Sep 16, 2022 •
edited
Loading

Summary

None

Purpose of change

Fixes #61031

Describe the solution

Earlier I removed stored reload_option::moves(), but turns out moves aren't stored in the object and instead dereferences ammo

Describe alternatives you've considered

Testing

Test scenario from linked issue should work before patch - and shouldn't crash after

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Vehicles Vehicles, parts, mechanics & interactions <Bugfix> This is a fix for a bug (or closes open issue) json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 16, 2022
@irwiss irwiss marked this pull request as ready for review September 16, 2022 13:58
@actually-a-cat actually-a-cat mentioned this pull request Sep 17, 2022
Closed
@dseguin dseguin merged commit d05dd99 into CleverRaven:master Sep 17, 2022
@irwiss irwiss deleted the fix-moves-deref-crash branch September 17, 2022 21:44
@irwiss irwiss mentioned this pull request Sep 19, 2022
Merged
@irwiss irwiss mentioned this pull request Sep 27, 2022
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
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Attempting to reload mounted weapons causes crash
2 participants
@irwiss @dseguin