more interaction cleanup

addons/interaction/CfgEventHandlers.hpp

@@ -10,3 +10,11 @@ class Extended_PostInit_EventHandlers {
         init = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };
+
+class Extended_Respawn_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            respawn = QUOTE((_this select 0) setVariable [ARR_3(QUOTE(QGVAR(assignedFireTeam)),(_this select 0) getVariable [ARR_2(QUOTE(QGVAR(assignedFireTeam)),'MAIN')],true)]);
+        };
+    };
+};

addons/interaction/CfgVehicles.hpp

@@ -102,15 +102,15 @@ class CfgVehicles {
                 };
                 class ACE_GetDown {
                     displayName = CSTRING(GetDown);
-                    condition = QUOTE([_target] call DFUNC(canInteractWithCivilian));
-                    statement = QUOTE([_target] call DFUNC(getDown));
+                    condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canInteractWithCivilian));
+                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(getDown));
                     showDisabled = 0;
                     priority = 2.2;
                 };
                 class ACE_SendAway {
                     displayName = CSTRING(SendAway);
-                    condition = QUOTE([_target] call DFUNC(canInteractWithCivilian));
-                    statement = QUOTE([_target] call DFUNC(sendAway));
+                    condition = QUOTE([ARR_2(_player,_target)] call DFUNC(canInteractWithCivilian));
+                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(sendAway));
                     showDisabled = 0;
                     priority = 2.0;
                 };

addons/interaction/functions/fnc_addPassengersActions.sqf

@@ -7,7 +7,7 @@
  * 1: Player <OBJECT>
  * 3: Parameters <ARRAY>
  *
- * Return value:
+ * Return Value:
  * Children actions <ARRAY>
  *
  * Example:

addons/interaction/functions/fnc_canInteractWithCivilian.sqf

@@ -4,7 +4,8 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Target has to be on the civilian side (default: true) <BOOL>
+ * 1: Target <OBJECT>
+ * 2: Target has to be on the civilian side (default: true) <BOOL>
  *
  * Return Value:
  * Able to interact with civilian <BOOL>
@@ -16,6 +17,6 @@
  */
 #include "script_component.hpp"
 
-params ["_unit", ["_isCivilian", true]];
+params ["_unit", "_target", ["_isCivilian", true]];
 
-alive _unit && [side _unit != side ACE_player, side group _unit == civilian] select _isCivilian // return
+alive _target && [side _target != side _unit, side group _target == civilian] select _isCivilian // return

addons/interaction/functions/fnc_canTapShoulder.sqf

@@ -6,7 +6,7 @@
  * 0: Player <OBJECT>
  * 1: Target <OBJECT>
  *
- * Return value:
+ * Return Value:
  * Able to tap a shoulder <BOOL>
  *
  * Example:

addons/interaction/functions/fnc_getDown.sqf

@@ -4,8 +4,9 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
+ * 1: Target <OBJECT>
  *
- * Return value:
+ * Return Value:
  * None
  *
  * Example:
@@ -17,7 +18,7 @@
 
 #define SEND_RADIUS 10
 
-params ["_unit"];
+params ["_unit", "_target"];
 
 _unit playActionNow "GestureGo";
 
@@ -29,4 +30,4 @@ _chance = [0.5, 0.8] select (count weapons _unit > 0);
         ["getDown", [_x], [_x]] call EFUNC(common,targetEvent);
     };
     false
-} count (_unit nearEntities ["Civilian", SEND_RADIUS]);
+} count (_target nearEntities ["Civilian", SEND_RADIUS]);

addons/interaction/functions/fnc_moduleInteraction.sqf

@@ -1,13 +1,13 @@
 /*
  * Author: bux578
- * Initializes the Interaction module
+ * Initializes the Interaction module.
  *
  * Arguments:
  * 0: Logic <NUMBER>
- * 1: ???
+ * 1: Units <ARRAY>
  * 2: Activation State <BOOL>
  *
- * Return value:
+ * Return Value:
  * None
  *
  * Example:
@@ -17,10 +17,7 @@
  */
 #include "script_component.hpp"
 
-private ["_logic", "_activated"];
-
-_logic = _this select 0;
-_activated = _this select 2;
+params ["_logic", "", "_activated"];
 
 if !(_activated) exitWith {};
 

addons/interaction/functions/fnc_openDoor.sqf

@@ -6,7 +6,7 @@
  * 0: House <OBJECT>
  * 1: Door <STRING>
  *
- * Return value:
+ * Return Value:
  * None
  *
  * Example:

addons/interaction/functions/fnc_tapShoulder.sqf

@@ -7,7 +7,7 @@
  * 1: Target <OBJECT>
  * 2: Shoulder which was tapped [0: left, 1: right] <NUMBER>
  *
- * Return value:
+ * Return Value:
  * None
  *
  * Example: