Compare commits

...

4 Commits

Author SHA1 Message Date
2e67e0e932 Merge pull request 'flag_simpleshape_variety' (#53) from flag_simpleshape_variety into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 45s
Reviewed-on: #53
2024-06-19 19:53:39 -05:00
1fea46355a Merge remote-tracking branch 'origin/develop' into flag_simpleshape_variety 2024-06-18 19:07:56 -07:00
de91b61fcc some updates 2024-06-18 19:05:54 -07:00
7c8cd6104b wip 2024-06-15 20:01:48 -07:00
3 changed files with 6 additions and 1 deletions

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"];

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"];

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
{ {