Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into medical-rewrite

Browse Source
This commit is contained in:
commy2 2016-09-27 18:59:43 +02:00
commit 09c5fbde15
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cargo/functions/fnc_paradropItem.sqf
View File

@ -49,7 +49,7 @@ private _itemObject = if (_item isEqualType objNull) then {
_newItem
};
_newItem setVelocity ((velocity _vehicle) vectorAdd ((vectorNormalized (vectorDir _vehicle)) vectorMultiply 10));
_itemObject setVelocity ((velocity _vehicle) vectorAdd ((vectorNormalized (vectorDir _vehicle)) vectorMultiply 10));
// open parachute and ir light effect
[{

2
addons/dogtags/config.cpp
View File

@ -6,7 +6,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
requiredAddons[] = {"ace_interaction"};
author = ECSTRING(common,ACETeam);
authors[] = {"SzwedzikPL"};
url = ECSTRING(main,URL);

7
addons/interact_menu/functions/fnc_addActionToClass.sqf
View File

@ -22,6 +22,7 @@
if (!params [["_objectType", "", [""]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
ERROR("Bad Params");
[]
};
TRACE_4("params",_objectType,_typeNum,_parentPath,_action);
@ -38,6 +39,9 @@ if (param [4, false, [false]]) exitwith {
', _index];
TRACE_2("Added inheritable action",_objectType,_index);
[_objectType, "init", _initEH, true, [], true] call CBA_fnc_addClassEventHandler;
// Return the full path
(_parentPath + [_action select 0])
};
// Ensure the config menu was compiled first
@ -62,10 +66,11 @@ private _parentNode = [_actionTrees, _parentPath] call FUNC(findActionNode);
if (isNil {_parentNode}) exitWith {
ERROR("Failed to add action");
ACE_LOGERROR_4("action (%1) to parent %2 on object %3 [%4]",(_action select 0),_parentPath,_objectType,_typeNum);
[]
};
// Add action node as children of the correct node of action tree
(_parentNode select 1) pushBack [_action,[]];
// Return the full path
(+ _parentPath) pushBack (_action select 0)
(_parentPath + [_action select 0])

3
addons/interact_menu/functions/fnc_addActionToObject.sqf
View File

@ -21,6 +21,7 @@
if (!params [["_object", objNull, [objNull]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
ERROR("Bad Params");
[]
};
private _varName = [QGVAR(actions),QGVAR(selfActions)] select _typeNum;
@ -38,4 +39,4 @@ if (_parentPath isEqualTo ["ACE_MainActions"]) then {
_actionList pushBack [_action, +_parentPath];
// Return the full path
(+ _parentPath) pushBack (_action select 0)
(_parentPath + [_action select 0])

2
docs/_includes/dependencies_list.md
View File

@ -75,7 +75,7 @@
{% endif %}
{% if include.component == "dogtags" %}
`ace_common`
`ace_interaction`
{% endif %}
{% if include.component == "dragging" %}