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 upFix NPC reload #15582
Conversation
Coolthulhu
added some commits
Feb 27, 2016
mugling
reviewed
Feb 27, 2016
|
|
||
| if( !weapon.reload( *this, std::move( ammo[0] ) ) ) { |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Coolthulhu
Feb 27, 2016
Author
Contributor
I think so. After I removed the default argument, I didn't need to change anything else.
This comment has been minimized.
This comment has been minimized.
mugling
Feb 27, 2016
Contributor
With the exception of the unit tests (which could do with reworking in any case)
kevingranade
merged commit ad7569c
into
CleverRaven:master
Feb 28, 2016
1 check failed
default
Details
Coolthulhu
deleted the
cataclysmbnteam:npc-reload
branch
May 13, 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.
Coolthulhu commentedFeb 27, 2016
Allows NPCs to reload items with magazines and with charges.
Closes #15397
Closes #15508
Doesn't let them reload magazines yet.
EDIT: Removed a badly handled default argument in
item::reload- theqtyargument has to be strictly positive, while the default argument was-1.