Linking belt refactoring #5206
Merged
Linking belt refactoring #5206
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.
jonpas
previously requested changes
May 26, 2017
|
|
||
| // Exit if the belt is full or empty | ||
| if ((_ammoCount == 0) || (getNumber (_magazineCfg >> "count") - _ammoCount) == 0) exitWith {false}; | ||
| if(!_canLink) exitWith{}; |
There was a problem hiding this comment.
Fixed thanks for input :)
Fixed requested change
PabstMirror
approved these changes
May 27, 2017
jonpas
reviewed
May 27, 2017
|
|
||
| // Exit if the belt is full or empty | ||
| if ((_ammoCount == 0) || (getNumber (_magazineCfg >> "count") - _ammoCount) == 0) exitWith {false}; | ||
| if ( !_canLink ) exitWith {} ; | ||
|
|
||
| // Check if the player has any of the same same magazines | ||
| // Calculate max ammo it can link |
There was a problem hiding this comment.
This section below is already included in FUNC(canLinkBelt) as well.
There was a problem hiding this comment.
Okey but I wanted to keep that FUNC(canLinkBelt) returned a bool and not a number.
So thats why i kept the lower part in both cases. But I could redo both of the files to keep them 100% unique?
Just say the word nad ill do it :)
There was a problem hiding this comment.
I think it would be a good idea to cut down on duplicate code if nothing else. As long as it doesn't make it more complicated.
|
|
||
| // Exit if the belt is full or empty | ||
| if ((_ammoCount == 0) || (getNumber (_magazineCfg >> "count") - _ammoCount) == 0) exitWith {false}; | ||
| if ( !_canLink ) exitWith {} ; |
There was a problem hiding this comment.
if (!_canLink) exitWith {}; would be per our coding guidelines.
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.
startLinkingbelt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.
Nothing will change with this, only easier to edit condition in the future.
First time edit so please point out malpractice.
When merged this pull request will: