Skip to content

Commit c2f1d4f

Browse files
trapw0wtrapw0w
committed
Replace BIS_fnc_param
Replacement of BIS_fnc_param with param/params for the following modules: - mil_c2istar - mil_command - mil_ied - mil_opcom - mil_placement - sup_combatsupport - sup_group_manager - sup_multispawn - sup_player_resupply - sys_adminactions - sys_data - sys_gc - sys_indexer - sys_marker - sys_newsfeed - sys_player - sys_tour - sys_xstream - x_lib
1 parent 06f2a38 commit c2f1d4f

File tree

34 files changed

+98
-172
lines changed

34 files changed

+98
-172
lines changed

‎addons/mil_c2istar/tasks/fnc_taskDestroyBuilding.sqf‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,11 @@ _result = [];
3333
switch (_taskState) do {
3434
case "init":{
3535

36-
private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetTypes","_blacklist"];
37-
38-
private _taskID = [_task, 0, "", [""]] call BIS_fnc_param;
39-
private _requestPlayerID = [_task, 1, "", [""]] call BIS_fnc_param;
40-
private _taskSide = [_task, 2, "", [""]] call BIS_fnc_param;
41-
private _taskFaction = [_task, 3, "", [""]] call BIS_fnc_param;
42-
private _taskType = [_task, 4, "", [""]] call BIS_fnc_param;
43-
private _taskLocationType = [_task, 5, "", [""]] call BIS_fnc_param;
44-
private _taskLocation = [_task, 6, [], [[]]] call BIS_fnc_param;
45-
private _taskPlayers = [_task, 7, [], [[]]] call BIS_fnc_param;
46-
private _taskEnemyFaction = [_task, 8, "", [""]] call BIS_fnc_param;
47-
private _taskCurrent = [_task, 9, "", [""]] call BIS_fnc_param;
48-
private _taskApplyType = [_task, 10, "", [""]] call BIS_fnc_param;
49-
private _targetBuildings = [_task, 11, [], [objnull,[]]] call BIS_fnc_param;
50-
private _tasksCurrent = ([ALiVE_TaskHandler,"tasks",["",[],[],nil]] call ALiVE_fnc_HashGet) select 2;
36+
private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetTypes","_blacklist", "_taskCurrent"];
37+
38+
_task params [["_taskID", "", [""]], ["_requestPlayerID", "", [""]], ["_taskSide", "", [""]], ["_taskFaction", "", [""]], ["_taskType", "", [""]], ["_taskLocationType", "", [""]],
39+
["_taskLocation", [], [[]]], ["_taskPlayers", [], [[]]], ["_taskEnemyFaction", "", [""]], ["_taskCurrent", "", [""]], ["_taskApplyType", "", [""]], ["_targetBuildings", [], [objNull,[]]]
40+
];
5141

5242
private _targetBuilding = switch (typeName _targetBuildings) do {
5343
case ("ARRAY") : {

‎addons/mil_c2istar/tasks/fnc_taskOCA.sqf‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,11 @@ _result = [];
3232
switch (_taskState) do {
3333
case "init":{
3434

35-
private [
36-
"_taskID","_requestPlayerID","_taskSide","_taskFaction","_taskLocationType","_taskLocation","_taskEnemyFaction","_taskCurrent",
37-
"_taskApplyType","_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetBuilding","_targetBuildings",
38-
"_targetTypes","_blacklist","_tasksCurrent"
39-
];
35+
private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_targetBuilding","_targetTypes","_blacklist","_tasksCurrent"];
4036

41-
_taskID = [_task, 0, "", [""]] call BIS_fnc_param;
42-
_requestPlayerID = [_task, 1, "", [""]] call BIS_fnc_param;
43-
_taskSide = [_task, 2, "", [""]] call BIS_fnc_param;
44-
_taskFaction = [_task, 3, "", [""]] call BIS_fnc_param;
45-
_taskLocationType = [_task, 5, "", [""]] call BIS_fnc_param;
46-
_taskLocation = [_task, 6, [], [[]]] call BIS_fnc_param;
47-
_taskPlayers = [_task, 7, [], [[]]] call BIS_fnc_param;
48-
_taskEnemyFaction = [_task, 8, "", [""]] call BIS_fnc_param;
49-
_taskCurrent = [_taskData, 9, "", [""]] call BIS_fnc_param;
50-
_taskApplyType = [_taskData, 10, "", [""]] call BIS_fnc_param;
51-
_targetBuildings = [_taskData, 11, [], [objnull]] call BIS_fnc_param;
37+
_task params [["_taskID", "", [""]], ["_requestPlayerID", "", [""]], ["_taskSide", "", [""]], ["_taskFaction", "", [""]], "", ["_taskLocationType", "", [""]],
38+
["_taskLocation", "", [""]], ["_taskPlayers", [], [[]]], ["_taskEnemyFaction", "", [""]], ["_taskCurrent", "", [""]], ["_taskApplyType", "", [""]], ["_taskBuildings", [], [objNull]]
39+
];
5240

5341
_tasksCurrent = ([ALiVE_TaskHandler,"tasks",["",[],[],nil]] call ALiVE_fnc_HashGet) select 2;
5442

‎addons/mil_command/fnc_ambush.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ params [
2929
["_params", [], [[]]]
3030
];
3131

32-
private _destination = [_params, 2, [0,0,0], [[]]] call BIS_fnc_param;
32+
private _destination = _params param [2, [0,0,0], [[]]];
3333

3434
if (isnil "_profile") exitwith {};
3535

‎addons/mil_command/fnc_commandRouter.sqf‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@ nil
3737
#define SUPERCLASS ALIVE_fnc_baseClassHash
3838
#define MAINCLASS ALIVE_fnc_commandRouter
3939

40-
private ["_logic","_operation","_args","_result"];
40+
private ["_result"];
41+
params [["_logic", objNull, [objNull,[]]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];
4142

4243
TRACE_1("commandRouter - input",_this);
43-
44-
_logic = [_this, 0, objNull, [objNull,[]]] call BIS_fnc_param;
45-
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
46-
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
4744
_result = true;
4845

4946
#define MTEMPLATE "ALiVE_COMMAND_ROUTER_%1"

‎addons/mil_command/fnc_garrison.sqf‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,14 @@ Author:
2424
Highhead
2525
---------------------------------------------------------------------------- */
2626

27-
private ["_type","_waypoints","_unit","_profile","_active","_args","_pos","_radius","_onlyProfiles","_assignments","_group"];
28-
29-
_profile = [_this, 0, ["",[],[],nil], [[]]] call BIS_fnc_param;
30-
_args = [_this, 1, 200, [-1,[]]] call BIS_fnc_param;
27+
private ["_type","_waypoints","_unit","_active","_pos","_radius","_onlyProfiles","_assignments","_group"];
28+
params [["_profile", ["",[],[],nil], [[]]], ["_args", 200, [-1,[]]]];
3129

3230
_radius = _args;
3331
_onlyProfiles = false;
3432

3533
if (_args isEqualType []) then {
36-
_radius = [_args, 0, 200, [-1]] call BIS_fnc_param;
34+
_radius = _args param [0, 200, [-1]];
3735
_onlyProfiles = (_args param [1, "false", [""]]) == "true";
3836
};
3937

‎addons/mil_command/fnc_insurgents.sqf‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ Author:
2424
Highhead
2525
---------------------------------------------------------------------------- */
2626

27-
private _profile = [_this, 0, ["",[],[],nil], [[]]] call BIS_fnc_param;
28-
private _params = [_this, 1, [], [[]]] call BIS_fnc_param;
29-
private _sidesEnemy = [_params, 0, ["WEST"], [[]]] call BIS_fnc_param;
27+
params [["_profile", ["",[],[],nil], [[]]], ["_params", [], [[]]]];
28+
private _sidesEnemy = _params param [0, ["WEST"], [[]]];
3029

3130
_sidesEnemy = +_sidesEnemy;
3231

‎addons/mil_ied/fnc_IED.sqf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ DEFAULT_CLUTTER [Land_Misc_Rubble_EP1","Land_Misc_Garb_Heap_EP1","Garbage_contai
7171
#define DEFAULT_CLUTTER ["Land_JunkPile_F","Land_GarbageContainer_closed_F","Land_GarbageBags_F","Land_Tyres_F","Land_GarbagePallet_F","Land_Basket_F","Land_Sack_F","Land_Sacks_goods_F","Land_Sacks_heap_F","Land_BarrelTrash_F"]
7272

7373
private ["_logic","_operation","_args","_result"];
74+
params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];
7475

7576
TRACE_1("IED - input",_this);
7677

77-
_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
78-
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
79-
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
8078
_result = true;
8179

8280
switch(_operation) do {

‎addons/mil_opcom/fnc_OPCOM.sqf‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,14 +1980,9 @@ switch(_operation) do {
19801980
_debug = [_logic, "debug",false] call ALIVE_fnc_HashGet;
19811981
_side = [_logic, "side","EAST"] call ALIVE_fnc_HashGet;
19821982

1983-
_id = [_args, 0, "", [""]] call BIS_fnc_param;
1984-
_pos = [_args, 1, [0,0,0], [[]]] call BIS_fnc_param;
1985-
_size = [_args, 2, 50, [-1]] call BIS_fnc_param;
1986-
_type = [_args, 3, "unknown", [""]] call BIS_fnc_param;
1987-
_priority = [_args, 4, 100, [-1]] call BIS_fnc_param;
1988-
_opcom_state = [_args, 5, "unassigned", [""]] call BIS_fnc_param;
1989-
_clusterID = [_args, 6, "none", [""]] call BIS_fnc_param;
1990-
_opcomID = [_args, 7, [_logic,"opcomID",""] call ALiVE_fnc_HashGet, [""]] call BIS_fnc_param;
1983+
_args params [["_id", "", [""]], ["_pos", [0,0,0], [[]]], ["_size", 50, [-1]], ["_type", "unknown", [""]], ["_priority", 100, [-1]],
1984+
["_opcom_state", "unassigned", [""]], ["_clusterID", "none", [""]], ["_opcomID", [_logic,"opcomID",""] call ALiVE_fnc_HashGet, [""]]
1985+
];
19911986

19921987
_target = [nil, "createhashobject"] call ALIVE_fnc_OPCOM;
19931988
[_target, "objectiveID",_id] call ALIVE_fnc_HashSet;

‎addons/mil_placement/fnc_MP.sqf‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ private ["_logic","_operation","_args","_result"];
6262

6363
TRACE_1("MP - input",_this);
6464

65-
_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
66-
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
67-
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
65+
params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];
6866
_result = true;
6967

7068
switch(_operation) do {

‎addons/sup_combatsupport/fnc_packMortar.sqf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ SCRIPT(packMortar);
1414
_this select 0: the support team group (group)
1515
_this select 1: the weapon (option if weapon registered as "supportWeaponSetup" variable)
1616
*/
17-
private["_group","_weapon","_position","_leader","_units","_gunner","_assistant","_type","_wait"];
17+
private["_position","_leader","_units","_gunner","_assistant","_type","_wait"];
1818

19-
_group = [_this, 0, grpNull] call bis_fnc_param;
20-
_weapon = [_this, 1, grpNull] call bis_fnc_param;
21-
_type = typeOf _weapon;
19+
params [["_group", grpNull], ["_weapon", grpNull]];
20+
21+
_type = typeOf _weapon;
2222
_position = position _weapon;
23-
_leader = leader _group;
24-
_gunner = gunner _weapon;
25-
_units = (units _group) - [_leader];
26-
_units = _units - [_gunner];
23+
_leader = leader _group;
24+
_gunner = gunner _weapon;
25+
_units = (units _group) - [_leader];
26+
_units = _units - [_gunner];
2727

2828
if (_weapon == objNull || isNil "_weapon" || _group == grpNull || _leader == objNull) exitWith {};
2929

0 commit comments

Comments
 (0)