diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp index db18cd12f16..e8cfb683518 100644 --- a/addons/common/XEH_PREP.hpp +++ b/addons/common/XEH_PREP.hpp @@ -125,6 +125,8 @@ PREP(hideUnit); PREP(interpolateFromArray); PREP(inTransitionAnim); PREP(isAwake); +PREP(isBeingCarried); +PREP(isBeingDragged); PREP(isEngineer); PREP(isEOD); PREP(isInBuilding); diff --git a/addons/medical_status/functions/fnc_isBeingCarried.sqf b/addons/common/functions/fnc_isBeingCarried.sqf similarity index 68% rename from addons/medical_status/functions/fnc_isBeingCarried.sqf rename to addons/common/functions/fnc_isBeingCarried.sqf index 2c4d6552f4d..be37d3719db 100644 --- a/addons/medical_status/functions/fnc_isBeingCarried.sqf +++ b/addons/common/functions/fnc_isBeingCarried.sqf @@ -1,18 +1,18 @@ #include "..\script_component.hpp" /* * Author: PabstMirror - * Returns if a target is being carried. (from ace_dragging) + * Returns if an object is being carried. (from ace_dragging) * * Arguments: - * 0: Target Unit + * 0: Object * * Return Value: * Is being carried * * Example: - * [bob] call ace_medical_status_fnc_isBeingCarried + * bob call ace_common_fnc_isBeingCarried * - * Public: No + * Public: Yes */ params ["_target"]; diff --git a/addons/medical_status/functions/fnc_isBeingDragged.sqf b/addons/common/functions/fnc_isBeingDragged.sqf similarity index 68% rename from addons/medical_status/functions/fnc_isBeingDragged.sqf rename to addons/common/functions/fnc_isBeingDragged.sqf index e5b3c5da881..e174ead200f 100644 --- a/addons/medical_status/functions/fnc_isBeingDragged.sqf +++ b/addons/common/functions/fnc_isBeingDragged.sqf @@ -1,18 +1,18 @@ #include "..\script_component.hpp" /* * Author: PabstMirror - * Returns if a target is being dragged. (from ace_dragging) + * Returns if an object is being dragged. (from ace_dragging) * * Arguments: - * 0: Target Unit + * 0: Object * * Return Value: * Is being dragged * * Example: - * [bob] call ace_medical_status_fnc_isBeingDragged + * bob call ace_common_fnc_isBeingDragged * - * Public: No + * Public: Yes */ params ["_target"]; diff --git a/addons/medical_status/XEH_PREP.hpp b/addons/medical_status/XEH_PREP.hpp index 967332da2e2..7bfd270f8de 100644 --- a/addons/medical_status/XEH_PREP.hpp +++ b/addons/medical_status/XEH_PREP.hpp @@ -11,8 +11,6 @@ PREP(handleKilled); PREP(handleKilledMission); PREP(hasStableVitals); PREP(initUnit); -PREP(isBeingCarried); -PREP(isBeingDragged); PREP(isInStableCondition); PREP(setCardiacArrestState); PREP(setDead); diff --git a/addons/medical_treatment/functions/fnc_loadUnit.sqf b/addons/medical_treatment/functions/fnc_loadUnit.sqf index edb9cbe0621..2632c6b9fad 100644 --- a/addons/medical_treatment/functions/fnc_loadUnit.sqf +++ b/addons/medical_treatment/functions/fnc_loadUnit.sqf @@ -24,11 +24,11 @@ if (_patient call EFUNC(common,isAwake)) exitWith { [[LSTRING(CanNotLoad), _patient call EFUNC(common,getName)]] call EFUNC(common,displayTextStructured); }; -if (_patient call EFUNC(medical_status,isBeingCarried)) then { +if (_patient call EFUNC(common,isBeingCarried)) then { [_medic, _patient] call EFUNC(dragging,dropObject_carry); }; -if (_patient call EFUNC(medical_status,isBeingDragged)) then { +if (_patient call EFUNC(common,isBeingDragged)) then { [_medic, _patient] call EFUNC(dragging,dropObject); };