Exit addEarplugs if earplugs are used #1759
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
|
|
||
| _unit = _this select 0; | ||
| // Exit if soldier has earplugs already in (persistence scenarios) | ||
| if (FUNC(hasEarPlugsIn)) exitWith {}; |
There was a problem hiding this comment.
"Error if: Type code, expected Bool"
probably should be:
if ([_unit] call FUNC(hasEarPlugsIn)) exitWith {};
There was a problem hiding this comment.
Oh crap, forgot to commit after fixing that! 😁
|
wouldn't removing earplugs on respawn be a better solution ? |
You mean by a mission/persistence system used? Yes of course, but this is not the only point of the PR. Right now if you have earplugs in already it will add another, which you'd normally just throw on the ground. |
|
Would it be ok to add an ACE_Settings setting to disable that automatic addition? |
Conflicts: addons/hearing/functions/fnc_addEarPlugs.sqf
|
Resolved conflicts and combined both PRs for performance. |
nicolasbadano
added a commit
that referenced
this pull request
Jul 1, 2015
Exit addEarplugs if earplugs are used
|
Thanks! |
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.
This solves duplicating Earplugs in persistence scenarios (eg. persistence mods). It will still add the earplugs if none are equipped, but in terms of persistence you would normally equip them and be done with it anyways.