Merge branch 'master' of github.com:KoffeinFlummi/ACE3

addons/interaction/XEH_postInit.sqf

@@ -15,6 +15,7 @@ if (!hasInterface) exitWith {};
 GVAR(isOpeningDoor) = false;
 
 // restore global fire teams for JIP
+private ["_team"];
 {
     _team = _x getVariable [QGVAR(assignedFireTeam), ""];
     if (_team != "") then {_x assignTeam _team};

addons/interaction/functions/fnc_addPassengerActions.sqf

@@ -11,7 +11,7 @@
  * Children actions <ARRAY>
  *
  * Example:
- * _array = [target, player, [params]] call ace_interaction_fnc_addPassengerAction
+ * array = [target, player, [params]] call ace_interaction_fnc_addPassengerAction
  *
  * Public: No
  */

addons/interaction/functions/fnc_addPassengersActions.sqf

@@ -11,7 +11,7 @@
  * Children actions <ARRAY>
  *
  * Example:
- * _array = [target, player, [params]] call ace_interaction_fnc_addPassengersActions
+ * [target, player, [params]] call ace_interaction_fnc_addPassengersActions
  *
  * Public: No
  */
@@ -23,8 +23,9 @@ private ["_actions"];
 _actions = [];
 
 {
+    private ["_unit"];
     _unit = _x;
-    if (_x != _player) then {
+    if (_unit != _player) then {
         _actions pushBack
             [
                 [

addons/interaction/functions/fnc_addSelectableItem.sqf

@@ -12,7 +12,7 @@
  * Container <ARRAY/NUMBER>
  *
  * Example:
- * _array = [_actions, "Banana", "UI\dot_ca.paa", "bananaContents"] call ace_interaction_fnc_addSelectableItem
+ * [actions, "Banana", "UI\dot_ca.paa", "bananaContents"] call ace_interaction_fnc_addSelectableItem
  *
  * Public: No
  */

addons/interaction/functions/fnc_applyButtons.sqf

@@ -15,7 +15,7 @@
  */
 #include "script_component.hpp"
 
-private ["_object", "_actions", "_dlgInteractionDialog", "_ctrlInteractionDialog", "_index", "_ctrlInteractionDialogIcon"];
+private ["_object", "_actions", "_dlgInteractionDialog", "_ctrlInteractionDialog", "_index", "_ctrlInteractionDialogIcon", "_a", "_action", "_count"];
 
 _object = GVAR(Target);
 _actions = GVAR(Buttons);

addons/interaction/functions/fnc_canBecomeLeader.sqf

@@ -10,7 +10,7 @@
  * Able to become leader of group <BOOL>
  *
  * Example:
- * _bool = [player, player] call ace_interaction_fnc_canBecomeLeader
+ * [player, player] call ace_interaction_fnc_canBecomeLeader
  *
  * Public: No
  */

addons/interaction/functions/fnc_canInteractWithCivilian.sqf

@@ -9,7 +9,7 @@
  * Able to interact with civilian <BOOL>
  *
  * Example:
- * _bool = [target] call ace_interaction_fnc_canInteractWithCivilian
+ * [target] call ace_interaction_fnc_canInteractWithCivilian
  *
  * Public: No
  */

addons/interaction/functions/fnc_canJoinGroup.sqf

@@ -10,7 +10,7 @@
  * Able to join a group <BOOL>
  *
  * Example:
- * _bool = [player, target] call ace_interaction_fnc_canJoinGroup
+ * [player, target] call ace_interaction_fnc_canJoinGroup
  *
  * Public: No
  */

addons/interaction/functions/fnc_canJoinTeam.sqf

@@ -10,7 +10,7 @@
  * Able to join a team <BOOL>
  *
  * Example:
- * _bool = [player, target] call ace_interaction_fnc_canJoinTeam
+ * [player, target] call ace_interaction_fnc_canJoinTeam
  *
  * Public: No
  */

addons/interaction/functions/fnc_canTapShoulder.sqf

@@ -10,7 +10,7 @@
  * Able to tap a shoulder <BOOL>
  *
  * Example:
- * _bool = [player, target] call ace_interaction_fnc_canTapShoulder
+ * [player, target] call ace_interaction_fnc_canTapShoulder
  *
  * Public: No
  */

addons/interaction/functions/fnc_getDoor.sqf

@@ -11,7 +11,7 @@
  * 1: Door Name <STRING>
  *
  * Example:
- * _array = [player, target] call ace_interaction_fnc_getDoor
+ * [player, target] call ace_interaction_fnc_getDoor
  *
  * Public: No
  */

addons/interaction/functions/fnc_getDoorAnimations.sqf

@@ -12,7 +12,7 @@
  * 1: Locked variable <STRING>
  *
  * Example:
- * _array = [target, "door"] call ace_interaction_fnc_getDoorAnimations
+ * array = [target, "door"] call ace_interaction_fnc_getDoorAnimations
  *
  * Public: No
  */

addons/interaction/functions/fnc_getSelectedButton.sqf

@@ -9,7 +9,7 @@
  * Angle <NUMBER>
  *
  * Example:
- * _number = call ace_interaction_fnc_getSelectedButton
+ * call ace_interaction_fnc_getSelectedButton
  *
  * Public: No
  */

addons/interaction/functions/fnc_getWeaponPos.sqf

@@ -3,13 +3,13 @@
  * Return a suitable position for the action point for the current weapon
  *
  * Arguments:
- * None
+ * None (uses local variable _target)
  *
  * Return value:
  * Children actions <ARRAY>
  *
  * Example:
- * _array = call ace_interaction_fnc_getWeaponPos
+ * call ace_interaction_fnc_getWeaponPos
  *
  * Public: No
  */

addons/interaction/functions/fnc_isInRange.sqf

@@ -10,7 +10,7 @@
  * Vehicle in range of player <BOOL>
  *
  * Example:
- * _bool = [target, 5] call ace_interaction_fnc_isInRange
+ * [target, 5] call ace_interaction_fnc_isInRange
  *
  * Public: No
  */

addons/interaction/functions/fnc_moveDown.sqf

@@ -15,7 +15,7 @@
  */
 #include "script_component.hpp"
 
-private ["_count", "_player", "_vehicle", "_dlgInteractionDialog", "_top", "_i", "", "_ctrl", "_index", "_action", "_color", "_current", "_infoText"];
+private ["_count", "_player", "_vehicle", "_dlgInteractionDialog", "_top", "_i", "", "_ctrl", "_index", "_action", "_color", "_current", "_infoText", "_target"];
 
 #define CLAMP(x,low,high) (if(x > high)then{high}else{if(x < low)then{low}else{x}})
 if (isNil QGVAR(MainButton)) exitWith{};

addons/interaction/functions/fnc_openDoor.sqf

@@ -39,6 +39,7 @@ GVAR(isOpeningDoor) = true;
 playSound "ACE_Sound_Click";
 
 [_house, _animations] spawn {
+    private ["_house", "_animations", "_phase", "_position", "_time", "_usedMouseWheel"];
     _house = _this select 0;
     _animations = _this select 1;
 

addons/interaction/functions/fnc_openSelectMenu.sqf

@@ -24,6 +24,8 @@
  */
 #include "script_component.hpp"
 
+private["_action", "_count", "_customActions", "_i"];
+
 if (!(profileNamespace getVariable [QGVAR(FlowMenu), false])) then {
     GVAR(SelectAccept) = _this select 1;
     GVAR(SelectCancel) = _this select 2;

addons/interaction/functions/fnc_prepareSelectMenu.sqf

@@ -7,10 +7,10 @@
  * 1: Approve Button Text <STRING>
  *
  * Return value:
- * Container object <ARRAY/NUMBER>
+ * Container object <NUMBER>
  *
  * Example:
- * _array = ["Select Explosive", "Place"] call ace_interaction_fnc_prepareSelectMenu
+ * array = ["Select Explosive", "Place"] call ace_interaction_fnc_prepareSelectMenu
  *
  * Public: No
  */

addons/interaction/functions/fnc_removeTag.sqf

@@ -16,7 +16,7 @@
 #include "script_component.hpp"
 
 0 spawn {
-    private ["_index"];
+    private ["_index", "_name"];
 
     waitUntil {player getVariable ["ACE_Name", ""] != ""};
 

addons/interaction/functions/fnc_sortOptionsByPriority.sqf

@@ -9,7 +9,7 @@
  * None
  *
  * Example:
- * _customActions call ace_interaction_fnc_sortOptionsByPriority
+ * customActions call ace_interaction_fnc_sortOptionsByPriority
  *
  * Public: No
  */

addons/interaction/functions/fnc_updateTooltipPosition.sqf

@@ -19,6 +19,8 @@
 
 PARAMS_3(_tooltip,_coordinateX,_coordinateY);
 
+private["_ctrl"];
+
 disableSerialization;
 _ctrl = ctrlParent _tooltip displayCtrl 40;