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 branch 'master' into fixUAVandInteractionInhert

Browse Source 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
This commit is contained in:
PabstMirror
2015-05-27 00:36:43 -05:00
parent 3daec7d98d b2330ae641
commit d2eb08594b
452 changed files with 5101 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/interact_menu/functions/fnc_compileMenu.sqf
View File

@ -14,10 +14,12 @@
EXPLODE_1_PVT(_this,_target);
private ["_objectType","_actionsVarName"];
private ["_objectType","_actionsVarName","_isMan"];
_objectType = _target;
_isMan = false;
if (typeName _target == "OBJECT") then {
_objectType = typeOf _target;
_isMan = _target isKindOf "CAManBase";
};
_actionsVarName = format [QGVAR(Act_%1), _objectType];
@ -94,10 +96,16 @@ _recurseFnc = {
_actions
};
private "_actionsCfg";
private ["_actionsCfg","_actions"];
_actionsCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_Actions";
missionNamespace setVariable [_actionsVarName, [_actionsCfg] call _recurseFnc];
// If the classname inherits from CAManBase, just copy it's menu without recompiling a new one
_actions = if (_isMan) then {
+ (missionNamespace getVariable QGVAR(Act_CAManBase))
} else {
[_actionsCfg] call _recurseFnc
};
missionNamespace setVariable [_actionsVarName, _actions];
/*
[