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

Remove use of CAManBase for all mans

Browse Source 
End use of bandaid from #1294
This commit is contained in:
PabstMirror 2016-01-09 22:05:40 -06:00
parent a161008eb7
commit dd979676fd
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/interact_menu/XEH_preInit.sqf
View File

@ -74,11 +74,6 @@ GVAR(collectedActionPoints) = [];
GVAR(foundActions) = [];
GVAR(lastTimeSearchedActions) = -1000;
// Init CAManBase menus
["CAManBase"] call FUNC(compileMenu);
["CAManBase"] call FUNC(compileMenuSelfAction);
// Init zeus menu
[] call FUNC(compileMenuZeus);

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

@ -15,7 +15,6 @@
params ["_target"];
private _objectType = _target;
private _isMan = _target isKindOf "CAManBase";
if (_target isEqualType objNull) then {
_objectType = typeOf _target;
};
@ -102,14 +101,9 @@ private _recurseFnc = {
private _actionsCfg = configFile >> "CfgVehicles" >> _objectType >> "ACE_Actions";
// If the classname inherits from CAManBase, just copy it's menu without recompiling a new one
private _actions = if (_isMan && {_objectType != "CaManBase"}) then {
TRACE_1("Copying ACE_Actions from CAManBase",_objectType);
+ (missionNamespace getVariable QGVAR(Act_CAManBase))
} else {
TRACE_1("Building ACE_Actions",_objectType);
[_actionsCfg, 0] call _recurseFnc
};
TRACE_1("Building ACE_Actions",_objectType);
private _actions = [_actionsCfg, 0] call _recurseFnc;
missionNamespace setVariable [_actionsVarName, _actions];
/*

15
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

@ -15,7 +15,6 @@
params ["_target"];
private _objectType = _target;
private _isMan = _target isKindOf "CAManBase";
if (_target isEqualType objNull) then {
_objectType = typeOf _target;
};
@ -103,14 +102,9 @@ if (_objectType isKindOf "CAManBase") then {
};
};
// If the classname inherits from CAManBase, just copy it's menu without recompiling a new one
private _actions = if (_isMan && {_objectType != "CaManBase"}) then {
TRACE_1("badbeef Copying ACE_SelfActions from CAManBase",_objectType);
+ (missionNamespace getVariable QGVAR(SelfAct_CAManBase))
} else {
TRACE_1("Building ACE_SelfActions",_objectType);
// Create a master action to base on self action
[
TRACE_1("Building ACE_SelfActions",_objectType);
// Create a master action to base on self action
private _actions = [
[
[
"ACE_SelfActions",
@ -129,7 +123,6 @@ private _actions = if (_isMan && {_objectType != "CaManBase"}) then {
],
[_actionsCfg] call _recurseFnc
]
]
};
];
missionNamespace setVariable [_actionsVarName, _actions];