From 8021ce42156d8282d7aff0bcc22e241c061fcf01 Mon Sep 17 00:00:00 2001
From: rufix <stefan@ruhfass.com>
Date: Wed, 29 Nov 2017 18:09:05 +0100
Subject: [PATCH] New function "setAimCoef" at common, change
 ace_advanced_fatigue_fnc_handleEffects to use new function instead of
 setCustomAimCoef

---
 .../functions/fnc_handleEffects.sqf           |  6 +--
 addons/common/XEH_PREP.hpp                    |  1 +
 addons/common/functions/fnc_setAimCoef.sqf    | 50 +++++++++++++++++++
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 addons/common/functions/fnc_setAimCoef.sqf

diff --git a/addons/advanced_fatigue/functions/fnc_handleEffects.sqf b/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
index 111727c826..cd1dc5c689 100644
--- a/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
@@ -90,12 +90,12 @@ if (_overexhausted) then {
 
 switch (stance _unit) do {
     case ("CROUCH"): {
-        _unit setCustomAimCoef (1.0 + _fatigue ^ 2 * 0.1);
+        [_unit, QUOTE(ADDON), 1.0 + _fatigue ^ 2 * 0.1] call EFUNC(common,setAimCoef);
     };
     case ("PRONE"): {
-        _unit setCustomAimCoef (1.0 + _fatigue ^ 2 * 2.0);
+        [_unit, QUOTE(ADDON), 1.0 + _fatigue ^ 2 * 2.0] call EFUNC(common,setAimCoef);
     };
     default {
-        _unit setCustomAimCoef (1.5 + _fatigue ^ 2 * 3.0);
+        [_unit, QUOTE(ADDON), 1.5 + _fatigue ^ 2 * 3.0] call EFUNC(common,setAimCoef);
     };
 };
diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
index d8c91ec843..99e3ec63de 100644
--- a/addons/common/XEH_PREP.hpp
+++ b/addons/common/XEH_PREP.hpp
@@ -142,6 +142,7 @@ PREP(runTests);
 PREP(sanitizeString);
 PREP(sendRequest);
 PREP(serverLog);
+PREP(setAimCoef);
 PREP(setApproximateVariablePublic);
 PREP(setDefinedVariable);
 PREP(setDisableUserInputStatus);
diff --git a/addons/common/functions/fnc_setAimCoef.sqf b/addons/common/functions/fnc_setAimCoef.sqf
new file mode 100644
index 0000000000..23898a3f3b
--- /dev/null
+++ b/addons/common/functions/fnc_setAimCoef.sqf
@@ -0,0 +1,50 @@
+/*
+ * Author: xrufix, Glowbal
+ * Handle set AimCoef calls. Will use highest available setting.
+ *
+ * Arguments:
+ * 0: id <STRING>
+ * 1: settings <NUMBER>
+ * 2: add [true] OR remove [false] (default: true) <BOOL>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player,"ace_advanced_fatigue", 1, true] call ace_common_fnc_setAimCoef
+ *
+ * Public: Yes
+ */
+#include "script_component.hpp"
+
+params ["_unit","_id", "_setting", ["_add", true]];
+
+private _exists = false;
+private _highestCoef = 1;
+private _map = _unit getVariable [QGVAR(setAimCoefMap), []];
+
+_map = _map select {
+    _x params ["_xID", "_xSetting"];
+    if (_id == _xID) then {
+        _exists = true;
+        if (_add) then {
+            _x set [1, _setting];
+            _highestCoef = _highestCoef max _setting;
+            true
+        } else {
+            false
+        };
+    } else {
+        _highestCoef = _highestCoef max _xSetting;
+        true
+    };
+};
+
+if (!exists && _add) then {
+	_highestCoef = _highestCoef max _setting;
+	_map pushBack [_id, _setting];
+};
+
+// Update the value
+_unit setVariable [QGVAR(setAimCoefMap), _map];
+_unit setCustomAimCoef _highestCoef;