Fix Merge

This commit is contained in:
PabstMirror 2015-09-20 11:28:43 -05:00
parent 7687374fcf
commit 610fb0bb2c

View File

@ -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];