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 macroSTR

Browse Source 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
This commit is contained in:
jonpas
2015-05-30 19:54:32 +02:00
parent 763cb07629 d7d225cebc
commit d934c25b78
171 changed files with 2840 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,8 @@ _recurseFnc = {
EXPLODE_1_PVT(_this,_actionsCfg);
_actions = [];
for "_i" from 0 to (count _actionsCfg) - 1 do {
_entryCfg = _actionsCfg select _i;
{
_entryCfg = _x;
if(isClass _entryCfg) then {
_displayName = getText (_entryCfg >> "displayName");
@ -76,7 +76,7 @@ _recurseFnc = {
];
_actions pushBack _entry;
};
};
} forEach (configProperties [_actionsCfg, "isClass _x", true]);
_actions
};