17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

Merge branch 'develop' into Campaign-Updates-6-9-2024

Browse Source
This commit is contained in:
hizumi
2024-06-19 19:54:49 -05:00
parent 04546e49f7 2e67e0e932
commit 68d793a519
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/vehicleFlags/functions/fn_compileFlagAction.sqf
View File

@@ -1,3 +1,5 @@
#include "..\script_component.hpp"
params ["_target", "_player", "_params", "_flagOptionCfg"]; params ["_target", "_player", "_params", "_flagOptionCfg"];
_params params ["_rootActionID", "_flagCategoryActionID", "_flagSubclassesCfgs"]; _params params ["_rootActionID", "_flagCategoryActionID", "_flagSubclassesCfgs"];

2
framework/vehicleFlags/functions/fn_compileFlagCategoryAction.sqf
View File

@@ -1,3 +1,5 @@
#include "..\script_component.hpp"
// diag_log format ["NewFlagCategory: %1 %2", _flagCategory, _flagOptions]; // diag_log format ["NewFlagCategory: %1 %2", _flagCategory, _flagOptions];
params ["_rootActionID", "_flagCategoryCfg"]; params ["_rootActionID", "_flagCategoryCfg"];

3
framework/vehicleFlags/functions/fn_getActionsFlagCategories.sqf
View File

@@ -5,6 +5,7 @@
0: STRING - Parent action ID 0: STRING - Parent action ID
1: ARRAY - Flag category configs 1: ARRAY - Flag category configs
*/ */
#include "..\script_component.hpp"
params ["_rootActionID", "_flagCategoryCfgs"]; params ["_rootActionID", "_flagCategoryCfgs"];
@@ -17,7 +18,7 @@ private _allCategoryActions = [];
_flagCategoryActions pushBack ([_rootActionID, _x] call FUNC(compileFlagCategoryAction)); _flagCategoryActions pushBack ([_rootActionID, _x] call FUNC(compileFlagCategoryAction));
} forEach (_x call BIS_fnc_returnChildren); } forEach (_x call BIS_fnc_returnChildren);
} else { } else {
_flagCategoryActions pushBack (_x call FUNC(compileFlagCategoryAction)); _flagCategoryActions pushBack ([_rootActionID, _x] call FUNC(compileFlagCategoryAction));
}; };
// add category to all category actions array // add category to all category actions array
{ {