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

Fix ammo handling for magless weapons #3584

Merged
merged 1 commit into from
Dec 7, 2024
Merged

Fix ammo handling for magless weapons #3584

merged 1 commit into from
Dec 7, 2024

Conversation

mszabo-wikia
Copy link
Contributor

Changes

Don't try to decrement ammo count in the magazine for weapons that don't have a magazine.

Testing

  • Compiles without warnings
  • Game runs without errors
  • Playtested a colony - tested that no errors occur and ammo (if applicable) is correctly consumed for a bolt-action rifle, a recurve bow, a triple rocket launcher and a burst-firing kpv.

@mszabo-wikia
Fix ammo handling for magless weapons
74f5677 
Don't try to decrement ammo count in the magazine for weapons that don't
have a magazine.
@mszabo-wikia mszabo-wikia requested review from a team as code owners December 6, 2024 23:46
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 6, 2024

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-12207824618.zip

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Dec 6, 2024
N7Huntsman
N7Huntsman approved these changes Dec 7, 2024
View reviewed changes
Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

Fixes the issue in my testing.

@perkinslr perkinslr merged commit 4c7150f into Development Dec 7, 2024
3 checks passed
@perkinslr perkinslr deleted the fix-magless-weapons branch December 7, 2024 03:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@N7Huntsman N7Huntsman N7Huntsman approved these changes

Assignees
No one assigned
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mszabo-wikia @N7Huntsman @perkinslr