From db7b78c068746caf8c2e1aac4c69778e3c2735e3 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 27 Aug 2024 05:59:22 +0200
Subject: [PATCH] Dragging - Add parameters check for `FUNC(setDraggable)` &
 `FUNC(setCarryable)` (#10264)

* Check params

* Update fnc_setDraggable.sqf
---
 .../dragging/functions/fnc_setCarryable.sqf   | 24 ++++++++++++++--
 .../dragging/functions/fnc_setDraggable.sqf   | 28 +++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/addons/dragging/functions/fnc_setCarryable.sqf b/addons/dragging/functions/fnc_setCarryable.sqf
index 60b9854f41..f20197769e 100644
--- a/addons/dragging/functions/fnc_setCarryable.sqf
+++ b/addons/dragging/functions/fnc_setCarryable.sqf
@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Object <OBJECT>
- * 1: True to enable carrying, false to disable <BOOL>
+ * 1: True to enable carrying, false to disable <BOOL> (default: false)
  * 2: Position offset for attachTo command <ARRAY> (default: [0, 1, 1])
  * 3: Direction in degrees to rotate the object after attachTo <NUMBER> (default: 0)
  * 4: Override weight limit <BOOL> (default: false)
@@ -14,12 +14,28 @@
  * None
  *
  * Example:
- * [cursorTarget, true, [0, 1, 1], 0, false] call ace_dragging_fnc_setCarryable;
+ * [cursorTarget, true, [0, 1, 1], 0, false] call ace_dragging_fnc_setCarryable
  *
  * Public: Yes
  */
 
-params ["_object", "_enableCarry", "_position", "_direction", ["_ignoreWeightCarry", false, [false]]];
+params [
+    ["_object", objNull, [objNull]],
+    ["_enableCarry", false, [false]],
+    "_position",
+    "_direction",
+    ["_ignoreWeightCarry", false, [false]]
+];
+
+if (isNull _object) exitWith {};
+
+if (!isNil "_position" && {!(_position isEqualType []) || {!(_position isEqualTypeArray [0, 0, 0])}}) exitWith {
+    ERROR_2("setCarryable: Bad position parameter [%1] for [%2], should be a 3D position or nil",_position,_object);
+};
+
+if (!isNil "_direction" && {!(_direction isEqualType 0)}) exitWith {
+    ERROR_2("setCarryable: Bad direction parameter [%1] for [%2], should be a number or nil",_direction,_object);
+};
 
 if (isNil "_position") then {
     _position = _object getVariable [QGVAR(carryPosition), [0, 1, 1]];
@@ -78,3 +94,5 @@ private _dropAction = [
 
 [_type, 0, ["ACE_MainActions"], _carryAction] call EFUNC(interact_menu,addActionToClass);
 [_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass);
+
+nil // return
diff --git a/addons/dragging/functions/fnc_setDraggable.sqf b/addons/dragging/functions/fnc_setDraggable.sqf
index e024ec5be2..34f7689e52 100644
--- a/addons/dragging/functions/fnc_setDraggable.sqf
+++ b/addons/dragging/functions/fnc_setDraggable.sqf
@@ -5,21 +5,37 @@
  *
  * Arguments:
  * 0: Object <OBJECT>
- * 1: True to enable dragging, false to disable <BOOL>
- * 2: Position offset for attachTo command (optional; default: [0, 1.5, 0]) <ARRAY>
- * 3: Direction in degrees to rotate the object after attachTo (optional; default: 0) <NUMBER>
+ * 1: True to enable dragging, false to disable <BOOL> (default: false)
+ * 2: Position offset for attachTo command <ARRAY> (default: [0, 1.5, 0])
+ * 3: Direction in degrees to rotate the object after attachTo <NUMBER> (default: 0)
  * 4: Override weight limit <BOOL> (default: false)
  *
  * Return Value:
  * None
  *
  * Example:
- * [cursorTarget, true, [0, 0, 0], 0, false] call ace_dragging_fnc_setDraggable;
+ * [cursorTarget, true, [0, 0, 0], 0, false] call ace_dragging_fnc_setDraggable
  *
  * Public: Yes
  */
 
-params ["_object", "_enableDrag", "_position", "_direction", ["_ignoreWeightDrag", false, [false]]];
+params [
+    ["_object", objNull, [objNull]],
+    ["_enableDrag", false, [false]],
+    "_position",
+    "_direction",
+    ["_ignoreWeightDrag", false, [false]]
+];
+
+if (isNull _object) exitWith {};
+
+if (!isNil "_position" && {!(_position isEqualType []) || {!(_position isEqualTypeArray [0, 0, 0])}}) exitWith {
+    ERROR_2("setDraggable: Bad position parameter [%1] for [%2], should be a 3D position or nil",_position,_object);
+};
+
+if (!isNil "_direction" && {!(_direction isEqualType 0)}) exitWith {
+    ERROR_2("setDraggable: Bad direction parameter [%1] for [%2], should be a number or nil",_direction,_object);
+};
 
 if (isNil "_position") then {
     _position = _object getVariable [QGVAR(dragPosition), [0, 1.5, 0]];
@@ -78,3 +94,5 @@ private _dropAction = [
 
 [_type, 0, ["ACE_MainActions"], _dragAction] call EFUNC(interact_menu,addActionToClass);
 [_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass);
+
+nil // return