Linkingbelt refactoring #5213
Merged
Linkingbelt refactoring #5213
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
startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.
Fixed requested change
canLinkBelt now returns a value over 0 if success and -1 if something is not right.
Fixed bug where if error we would not exit
kymckay
reviewed
May 27, 2017
addons/reload/CfgVehicles.hpp
Outdated
| @@ -6,7 +6,7 @@ class CfgVehicles { | |||
| class GVAR(LinkBelt) { | |||
| displayName = CSTRING(LinkBelt); | |||
| distance = 2.0; | |||
| condition = QUOTE([ARR_2(_player, _target)] call FUNC(canLinkBelt)); | |||
| condition = QUOTE(([ARR_2(_player, _target)] call FUNC(canLinkBelt) > 0)); | |||
There was a problem hiding this comment.
Is this meant to be:
QUOTE(([ARR_2(_player, _target)] call FUNC(canLinkBelt)) > 0)
Otherwise the extra set of brackets aren't doing anything 😛
There was a problem hiding this comment.
Yes. Woops little to fast maybe.
Was thinking about it but it was to far of a leap 😛
Fnc_maxAmmiLinkBelt? Help me.
Changed name to better reflect the function of the function.
|
Fixed! |
jonpas
previously requested changes
May 28, 2017
| * Check if the target has an MG equiped with belt system that the player can link | ||
| * | ||
| * Arguments: | ||
| * 0: Player <OBJECT> | ||
| * 1: Target <OBJECT> | ||
| * | ||
| * Return Value: | ||
| * Can link belt<BOOL> | ||
| * MaxAmmo magazine <INT> |
There was a problem hiding this comment.
Maximum ammo of magazine (-1 on error)
fixed return value info
… into Phyma-linkingbelt-refactoring
PabstMirror
approved these changes
May 29, 2017
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.
Removed redundant code fnc_canLinkBelt now returns a value over 0 if success and -1 if error.
This is so there is no equal code in canLinkBelt and startLinkBelt.
Changes to config so it works.
When merged this pull request will: