-
Notifications
You must be signed in to change notification settings - Fork 88
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
Add "Ammo per shot" DEHACKED field #24
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Quick-ish update: needed to add a check for |
Just updated |
kraflab
reviewed
Apr 15, 2021
kraflab
reviewed
Apr 15, 2021
kraflab
reviewed
Apr 15, 2021
I'll resolve the conflicts, sec |
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a new
Ammo per shot
field to DEHACKED. Implementation mirrors Eternity's, for forward-compat n' whatnot.A summary of sorts:
A_ConsumeAmmo
andA_CheckAmmo
MBF21 DEHACKED codepointers will use the ready weapon'sAmmo per shot
field if theamount
arg is set to zero.Ammo per shot
field is explicitly set on a weapon.Ammo per shot
field is subtracted from the weapon's ammo type.Ammo per shot
field.There's a little bit of refactoring of things that touches a bit of Heretic (namely, all the various ammo-per-shot arrays for the doom/heretic weapons were replaced with the new weaponinfo_t ammopershot field ), though this feature is not yet fully implemented for Heretic 'cause it doesn't do DEH. ;) -- I tested Heretic to make sure it all works as intended still (and the spec passes), so all should be well there.
[Will update mbf21.md here in a bit; need to make the PR first. ;]