Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upChange order of events in player::fire_gun #14525
+28
−27
Conversation
kevingranade
merged commit 42ab7b9
into
CleverRaven:master
Dec 20, 2015
1 check passed
default
Details
drayath
referenced this pull request
Dec 20, 2015
Closed
Crash when firing turreted laser weapon. #14528
mugling
deleted the
mugling:fix_pj2
branch
Jan 31, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
mugling commentedDec 20, 2015
The order of events in
player::fire_gunis significant. When the last unit of ammunition is consumeditem::ammo_consume()should unsetcurammo.The order of events is updated to:
player::handle_gun_damage)projectile_attack)item::ammo_consume)player::practice)This is the minimal required changes to hopefully fix #14524.