Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Medical Feedback - Fix overriding hearing setting when unconscious #7744

Merged
merged 1 commit into from
Jun 13, 2020

Conversation

severgun
Copy link
Contributor

When merged this pull request will:

  • Title

Currently if ace_hearing_unconsciousnessVolume > 0.25 it will be ignored in favor of

#define VOL_UNCONSCIOUS 0.25

@PabstMirror PabstMirror added this to the 3.13.3 milestone Jun 10, 2020
@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Jun 10, 2020
@PabstMirror PabstMirror changed the title Fix medical_feedback override hearing settings Medical Feedback - Fix overriding hearing setting when unconscious Jun 10, 2020
@PabstMirror
Copy link
Contributor

Looks good, I think we could even delete

// Reduce volume if player is unconscious
if (ACE_player getVariable ["ACE_isUnconscious", false]) then {
    _volume = _volume min GVAR(UnconsciousnessVolume);
};

https://github.com/acemod/ACE3/blob/master/addons/hearing/functions/fnc_updateVolume.sqf#L59-L62

from hearing, as the effect will be taken care of by medical_feedback now

@PabstMirror
Copy link
Contributor

We could also move the setting to medical_feedback

@PabstMirror PabstMirror merged commit 56b397f into acemod:master Jun 13, 2020
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.

2 participants