diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf index 2e6371e40b..331edd5b21 100644 --- a/addons/medical/XEH_preInit.sqf +++ b/addons/medical/XEH_preInit.sqf @@ -148,6 +148,7 @@ PREP(moduleBasicRevive); PREP(setWeaponsCorrectUnconscious); PREP(setCaptiveSwitch); + // initalize all module parameters. GVAR(setting_allowInstantDead) = true; GVAR(setting_AdvancedLevel) = 0; diff --git a/addons/medical/functions/fnc_actionCarryUnit.sqf b/addons/medical/functions/fnc_actionCarryUnit.sqf index d824b426b5..d3cfb35aee 100644 --- a/addons/medical/functions/fnc_actionCarryUnit.sqf +++ b/addons/medical/functions/fnc_actionCarryUnit.sqf @@ -42,11 +42,11 @@ if (!alive _unit) exitwith { [_caller, false] call FUNC(treatmentMutex); [{ _this call FUNC(actionCarryUnit); - }, [_caller, ([_unit,_caller] call EFUNC(medical,makeCopyOfBody_F)), _killOnDrop], 0.2, 0.2] call EFUNC(common,waitAndExecute); + }, [_caller, ([_unit,_caller] call FUNC(makeCopyOfBody_F)), _killOnDrop], 0.25, 0.25] call EFUNC(common,waitAndExecute); }; if !([_caller,_unit] call EFUNC(common,carryObj)) exitwith { - ["couldn't carry object!"] call EFUNC(common,debug); [_caller,"release"] call FUNC(treatmentMutex); + ["couldn't carry object!"] call EFUNC(common,debug); [_caller,false] call FUNC(treatmentMutex); }; if (primaryWeapon _caller == "") then { diff --git a/addons/medical/functions/fnc_actionDragUnit.sqf b/addons/medical/functions/fnc_actionDragUnit.sqf index 3ec7cbf049..d0fa1c70ea 100644 --- a/addons/medical/functions/fnc_actionDragUnit.sqf +++ b/addons/medical/functions/fnc_actionDragUnit.sqf @@ -40,7 +40,7 @@ if (!alive _unit) exitwith { [_caller, false] call FUNC(treatmentMutex); [{ _this call FUNC(actionDragUnit); - }, [_caller, ([_unit,_caller] call EFUNC(medical,makeCopyOfBody_F)), _killOnDrop], 0.2, 0.2] call EFUNC(common,waitAndExecute); + }, [_caller, ([_unit,_caller] call FUNC(makeCopyOfBody_F)), _killOnDrop], 0.25, 0.25] call EFUNC(common,waitAndExecute); }; if (primaryWeapon _caller == "") then { @@ -66,7 +66,6 @@ if (currentWeapon _caller == primaryWeapon _caller) then { [_caller,"AcinPknlMstpSnonWnonDnon", 1] call EFUNC(common,doAnimation); }; - _caller setvariable [QGVAR(StartingPositionHandleTreatment), getPos _caller]; [2, {((vehicle (_this select 0) != (_this select 0)) ||((getPos (_this select 0)) distance ((_this select 0) getvariable QGVAR(StartingPositionHandleTreatment)) < 1.5))}, // the condition diff --git a/addons/medical/functions/fnc_makeCopyOfBody_f.sqf b/addons/medical/functions/fnc_makeCopyOfBody_f.sqf index 58abab5479..cee0631862 100644 --- a/addons/medical/functions/fnc_makeCopyOfBody_f.sqf +++ b/addons/medical/functions/fnc_makeCopyOfBody_f.sqf @@ -15,7 +15,7 @@ _oldBody = _this select 0; _caller = _this select 1; if (alive _oldBody) exitwith {_oldBody}; // we only want to do this for dead bodies - _name = _oldBody getvariable [QGVAR(name),"unknown"]; + _name = _oldBody getvariable ["ACE_name","unknown"]; _class = typeof _oldBody; _side = side _caller; _group = createGroup _side; @@ -28,7 +28,7 @@ _caller = _this select 1; { [_newUnit,_x select 0, _x select 2] call EFUNC(common,setDefinedVariable); }foreach _allVariables; - _newUnit setVariable [QGVAR(name),_name,true]; + _newUnit setVariable ["ACE_name",_name,true]; _newUnit disableAI "TARGET"; _newUnit disableAI "AUTOTARGET";