Skip to content

Hide earplug actions if setting disabled#4913

Merged
PabstMirror merged 2 commits intomasterfrom
fixEarPlugs
Feb 16, 2017
Merged

Hide earplug actions if setting disabled#4913
PabstMirror merged 2 commits intomasterfrom
fixEarPlugs

Conversation

@PabstMirror
Copy link
Contributor

Fix #4912

Hides the actions if combat deafness setting is disabled.
Also add exits on the functions in case they are manually called by a script/mission

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Feb 16, 2017
@PabstMirror PabstMirror added this to the 3.9.1 milestone Feb 16, 2017
#include "script_component.hpp"

params ["_player"];
if (!GVAR(EnableCombatDeafness)) exitWith {};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should probably do an empty line above.

@PabstMirror PabstMirror merged commit 9d12815 into master Feb 16, 2017
@PabstMirror PabstMirror deleted the fixEarPlugs branch February 16, 2017 16:16
thojkooi pushed a commit that referenced this pull request Mar 13, 2017
* Hide earplug actions if setting disabled

* Add lines that are new
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/bug-fix Release Notes: **FIXED:**

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants