From 610fb0bb2c49c145db75dd5ca3cd8a370a5aa605 Mon Sep 17 00:00:00 2001
From: PabstMirror <elephantisaterriblemascot@gmail.com>
Date: Sun, 20 Sep 2015 11:28:43 -0500
Subject: [PATCH] Fix Merge

---
 .../common/functions/fnc_resetAllDefaults.sqf | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/common/functions/fnc_resetAllDefaults.sqf b/addons/common/functions/fnc_resetAllDefaults.sqf
index be2eec050a..c2ba1bee18 100644
--- a/addons/common/functions/fnc_resetAllDefaults.sqf
+++ b/addons/common/functions/fnc_resetAllDefaults.sqf
@@ -1,39 +1,44 @@
-/**
- * fn_resetAllDefaults_f.sqf
- * @Descr: reset all variables that have been defined
- * @Author: Glowbal
+/*
+ * Author: Glowbal
+ * reset all variables that have been defined
  *
- * @Arguments: []
- * @Return:
- * @PublicAPI: false
+ * Arguments:
+ * ?
+ *
+ * Return Value:
+ * ?
+ *
+ * Public: No
  */
-
 #include "script_component.hpp"
 
-PARAMS_1(_unit);
+params ["_unit"];
 
-_unit setvariable ["ACE_isDead",nil,true];
+_unit setvariable ["ACE_isDead", nil, true];
 _unit setvariable ["ACE_isUnconscious", nil, true];
 
 if (isPlayer _unit) then {
     [true] call FUNC(setVolume);
     // [false] call FUNC(disableKeyInput); //func does not exist
+    
     if (["ace_medical"] call FUNC(isModLoaded)) then {
         // [false] call EFUNC(medical,effectBlackOut); //func does not exist
     };
 
-    if !(isnil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then {
+    if !(isNil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then {
         // clear all disable user input
         {
             [_x, false] call FUNC(setDisableUserInputStatus);
-        }foreach GVAR(DISABLE_USER_INPUT_COLLECTION);
+            false
+        } count GVAR(DISABLE_USER_INPUT_COLLECTION);
     };
 };
 
 {
-    if (!(_x select 4)) then {
-        _unit setvariable [(_x select 0),nil,_x select 3];
+    if !(_x select 4) then {
+        _unit setvariable [_x select 0, nil, _x select 3];
     };
-} forEach ([_unit] call FUNC(getAllDefinedSetVariables));
+    false
+} count ([_unit] call FUNC(getAllDefinedSetVariables));
 
 _unit setVariable ["ACE_forceWalkStatusNumber", 0, true];