Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace BIS_fnc_param #707

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions addons/mil_c2istar/tasks/fnc_taskDestroyBuilding.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,11 @@ _result = [];
switch (_taskState) do {
case "init":{

private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetTypes","_blacklist"];

private _taskID = [_task, 0, "", [""]] call BIS_fnc_param;
private _requestPlayerID = [_task, 1, "", [""]] call BIS_fnc_param;
private _taskSide = [_task, 2, "", [""]] call BIS_fnc_param;
private _taskFaction = [_task, 3, "", [""]] call BIS_fnc_param;
private _taskType = [_task, 4, "", [""]] call BIS_fnc_param;
private _taskLocationType = [_task, 5, "", [""]] call BIS_fnc_param;
private _taskLocation = [_task, 6, [], [[]]] call BIS_fnc_param;
private _taskPlayers = [_task, 7, [], [[]]] call BIS_fnc_param;
private _taskEnemyFaction = [_task, 8, "", [""]] call BIS_fnc_param;
private _taskCurrent = [_task, 9, "", [""]] call BIS_fnc_param;
private _taskApplyType = [_task, 10, "", [""]] call BIS_fnc_param;
private _targetBuildings = [_task, 11, [], [objnull,[]]] call BIS_fnc_param;
private _tasksCurrent = ([ALiVE_TaskHandler,"tasks",["",[],[],nil]] call ALiVE_fnc_HashGet) select 2;
private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetTypes","_blacklist", "_taskCurrent"];

_task params [["_taskID", "", [""]], ["_requestPlayerID", "", [""]], ["_taskSide", "", [""]], ["_taskFaction", "", [""]], ["_taskType", "", [""]], ["_taskLocationType", "", [""]],
["_taskLocation", [], [[]]], ["_taskPlayers", [], [[]]], ["_taskEnemyFaction", "", [""]], ["_taskCurrent", "", [""]], ["_taskApplyType", "", [""]], ["_targetBuildings", [], [objNull,[]]]
];

private _targetBuilding = objNull;

Expand Down
20 changes: 4 additions & 16 deletions addons/mil_c2istar/tasks/fnc_taskOCA.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,11 @@ _result = [];
switch (_taskState) do {
case "init":{

private [
"_taskID","_requestPlayerID","_taskSide","_taskFaction","_taskLocationType","_taskLocation","_taskEnemyFaction","_taskCurrent",
"_taskApplyType","_startTime","_taskEnemySide","_targetSector","_targetEntity","_taskPlayers","_targetBuilding","_targetBuildings",
"_targetTypes","_blacklist","_tasksCurrent"
];
private ["_startTime","_taskEnemySide","_targetSector","_targetEntity","_targetBuilding","_targetTypes","_blacklist","_tasksCurrent"];

_taskID = [_task, 0, "", [""]] call BIS_fnc_param;
_requestPlayerID = [_task, 1, "", [""]] call BIS_fnc_param;
_taskSide = [_task, 2, "", [""]] call BIS_fnc_param;
_taskFaction = [_task, 3, "", [""]] call BIS_fnc_param;
_taskLocationType = [_task, 5, "", [""]] call BIS_fnc_param;
_taskLocation = [_task, 6, [], [[]]] call BIS_fnc_param;
_taskPlayers = [_task, 7, [], [[]]] call BIS_fnc_param;
_taskEnemyFaction = [_task, 8, "", [""]] call BIS_fnc_param;
_taskCurrent = [_taskData, 9, "", [""]] call BIS_fnc_param;
_taskApplyType = [_taskData, 10, "", [""]] call BIS_fnc_param;
_targetBuildings = [_taskData, 11, [], [objnull]] call BIS_fnc_param;
_task params [["_taskID", "", [""]], ["_requestPlayerID", "", [""]], ["_taskSide", "", [""]], ["_taskFaction", "", [""]], "", ["_taskLocationType", "", [""]],
["_taskLocation", "", [""]], ["_taskPlayers", [], [[]]], ["_taskEnemyFaction", "", [""]], ["_taskCurrent", "", [""]], ["_taskApplyType", "", [""]], ["_taskBuildings", [], [objNull]]
];

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

Expand Down
4 changes: 1 addition & 3 deletions addons/mil_command/fnc_ambush.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@ params [
["_params", [], [[]]]
];

//["Params %1",_params] call AliVE_fnc_DumpH; getRelDir

private _destination = [_params, 2, [0,0,0], [[]]] call BIS_fnc_param;
private _destination = _params param [2, [0,0,0], [[]]];

if (isnil "_profile") exitwith {};

Expand Down
7 changes: 2 additions & 5 deletions addons/mil_command/fnc_commandRouter.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,10 @@ nil
#define SUPERCLASS ALIVE_fnc_baseClassHash
#define MAINCLASS ALIVE_fnc_commandRouter

private ["_logic","_operation","_args","_result"];
private ["_result"];
params [["_logic", objNull, [objNull,[]]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

TRACE_1("commandRouter - input",_this);

_logic = [_this, 0, objNull, [objNull,[]]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
_result = true;

#define MTEMPLATE "ALiVE_COMMAND_ROUTER_%1"
Expand Down
8 changes: 3 additions & 5 deletions addons/mil_command/fnc_garrison.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@ Author:
Highhead
---------------------------------------------------------------------------- */

private ["_type","_waypoints","_unit","_profile","_active","_args","_pos","_radius","_onlyProfiles","_assignments","_group"];

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

_radius = _args;
_onlyProfiles = true;

if (_args isEqualType []) then {
_radius = [_args, 0, 200, [-1]] call BIS_fnc_param;
_radius = _args param [0, 200, [-1]];
_onlyProfiles = (_args param [1, "false", [""]]) == "true";
};

Expand Down
5 changes: 2 additions & 3 deletions addons/mil_command/fnc_insurgents.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ Author:
Highhead
---------------------------------------------------------------------------- */

private _profile = [_this, 0, ["",[],[],nil], [[]]] call BIS_fnc_param;
private _params = [_this, 1, [], [[]]] call BIS_fnc_param;
private _sidesEnemy = [_params, 0, ["WEST"], [[]]] call BIS_fnc_param;
params [["_profile", ["",[],[],nil], [[]]], ["_params", [], [[]]]];
private _sidesEnemy = _params param [0, ["WEST"], [[]]];

_sidesEnemy = +_sidesEnemy;

Expand Down
8 changes: 2 additions & 6 deletions addons/mil_ied/fnc_IED.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,10 @@ DEFAULT_CLUTTER [Land_Misc_Rubble_EP1","Land_Misc_Garb_Heap_EP1","Garbage_contai
#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"]

private ["_logic","_operation","_args","_result"];
params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

TRACE_1("IED - input",_this);

params [
["_logic", objNull, [objNull]],
["_operation", "", [""]],
["_args", objNull, [objNull,[],"",0,true,false]]
];
TRACE_1("IED - input",_this);

_result = true;

Expand Down
11 changes: 3 additions & 8 deletions addons/mil_opcom/fnc_OPCOM.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -2043,14 +2043,9 @@ switch(_operation) do {
_debug = [_logic, "debug",false] call ALIVE_fnc_HashGet;
_side = [_logic, "side","EAST"] call ALIVE_fnc_HashGet;

_id = [_args, 0, "", [""]] call BIS_fnc_param;
_pos = [_args, 1, [0,0,0], [[]]] call BIS_fnc_param;
_size = [_args, 2, 50, [-1]] call BIS_fnc_param;
_type = [_args, 3, "unknown", [""]] call BIS_fnc_param;
_priority = [_args, 4, 100, [-1]] call BIS_fnc_param;
_opcom_state = [_args, 5, "unassigned", [""]] call BIS_fnc_param;
_clusterID = [_args, 6, "none", [""]] call BIS_fnc_param;
_opcomID = [_args, 7, [_logic,"opcomID",""] call ALiVE_fnc_HashGet, [""]] call BIS_fnc_param;
_args params [["_id", "", [""]], ["_pos", [0,0,0], [[]]], ["_size", 50, [-1]], ["_type", "unknown", [""]], ["_priority", 100, [-1]],
["_opcom_state", "unassigned", [""]], ["_clusterID", "none", [""]], ["_opcomID", [_logic,"opcomID",""] call ALiVE_fnc_HashGet, [""]]
];

_target = [nil, "createhashobject"] call ALIVE_fnc_OPCOM;
[_target, "objectiveID",_id] call ALIVE_fnc_HashSet;
Expand Down
4 changes: 1 addition & 3 deletions addons/mil_placement/fnc_MP.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ private ["_logic","_operation","_args","_result"];

TRACE_1("MP - input",_this);

_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];
_result = true;

switch(_operation) do {
Expand Down
16 changes: 8 additions & 8 deletions addons/sup_combatsupport/fnc_packMortar.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ SCRIPT(packMortar);
_this select 0: the support team group (group)
_this select 1: the weapon (option if weapon registered as "supportWeaponSetup" variable)
*/
private["_group","_weapon","_position","_leader","_units","_gunner","_assistant","_type","_wait"];
private["_position","_leader","_units","_gunner","_assistant","_type","_wait"];

_group = [_this, 0, grpNull] call bis_fnc_param;
_weapon = [_this, 1, grpNull] call bis_fnc_param;
_type = typeOf _weapon;
params [["_group", grpNull], ["_weapon", grpNull]];

_type = typeOf _weapon;
_position = position _weapon;
_leader = leader _group;
_gunner = gunner _weapon;
_units = (units _group) - [_leader];
_units = _units - [_gunner];
_leader = leader _group;
_gunner = gunner _weapon;
_units = (units _group) - [_leader];
_units = _units - [_gunner];

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

Expand Down
10 changes: 4 additions & 6 deletions addons/sup_combatsupport/fnc_unpackMortar.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ SCRIPT(unpackMortar);
_this select 1: location to place gun (position)
_this select 2: location of target (position)
*/
private ["_group","_position","_targetPos","_leader","_units","_gunner","_assistant","_weapon"];
private ["_leader","_units","_gunner","_assistant"];

//diag_log str(_this);

_group = [_this, 0, grpNull] call bis_fnc_param;
_position = [_this, 1, grpNull] call bis_fnc_param;
_targetPos = [_this, 2, grpNull] call bis_fnc_param;
_weapon = [_this, 3, grpNull] call bis_fnc_param;
_units = (units _group);
params [["_group", grpNull], ["_position", grpNull], ["_targetPos", grpNull], ["_weapon", grpNull]];

_units = (units _group);

{
if (vehicle _x != _x) then {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
// Example: [[group,groupID], "CP_fnc_setGroupID", false, false] spawn BIS_fnc_MP;
// Params:
//==============================================================================================================================================================================
private ["_group","_groupID"];

_group = [_this, 0, grpNull, [grpNull,objNull]] call BIS_fnc_param;
_groupID = [_this, 1, "none", [""]] call BIS_fnc_param;
params [["_group", grpNull, [grpNull,objNull]], ["_groupID", "none", [""]]];

_group = if (typeName _group == "OBJECT") then {group _group} else {_group};

Expand Down
7 changes: 3 additions & 4 deletions addons/sup_group_manager/fnc_GM.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,12 @@ Peer Reviewed:
#define GM_getSelData(ctrl) (lbData[##ctrl,(lbCurSel ##ctrl)])


private ["_logic","_operation","_args","_result"];
private ["_result"];

params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

TRACE_1("GM - input",_this);

_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
_result = true;

switch(_operation) do {
Expand Down
7 changes: 3 additions & 4 deletions addons/sup_group_manager/fnc_groupHandler.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,12 @@ nil
#define SUPERCLASS ALIVE_fnc_baseClassHash
#define MAINCLASS ALIVE_fnc_groupHandler

private ["_logic","_operation","_args","_result"];
private ["_result"];

params [["_logic", objNull, [objNull,[]]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

TRACE_1("groupHandler - input",_this);

_logic = [_this, 0, objNull, [objNull,[]]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
//_result = true;

#define MTEMPLATE "ALiVE_GROUPHANDLER_%1"
Expand Down
12 changes: 2 additions & 10 deletions addons/sup_multispawn/fnc_establishingShotCustom.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,11 @@ Peer reviewed:
nil
---------------------------------------------------------------------------- */

private ["_tgt", "_txt", "_alt", "_rad", "_ang", "_dir"];
params [["_tgt", objNull, [objNull, []]], ["_txt", "", [""]], ["_alt", 500, [500]], ["_rad", 200, [200]], ["_ang", random 360, [0]], ["_dir", round random 1, [0]], ["_condition", [[],{true}], [[]]]];

if !(hasInterface) exitwith {};

_tgt = [_this, 0, objNull, [objNull, []]] call BIS_fnc_param;
_txt = [_this, 1, "", [""]] call BIS_fnc_param;
_alt = [_this, 2, 500, [500]] call BIS_fnc_param;
_rad = [_this, 3, 200, [200]] call BIS_fnc_param;
_ang = [_this, 4, random 360, [0]] call BIS_fnc_param;
_dir = [_this, 5, round random 1, [0]] call BIS_fnc_param;
_condition = [_this, 8, [[],{true}], [[]]] call BIS_fnc_param;

ALiVE_fnc_establishingShot_icons = [_this, 6, [], [[]]] call BIS_fnc_param;
ALiVE_fnc_establishingShot_icons = _this param [6, [], [[]]];

private ["_mode"];

Expand Down
28 changes: 11 additions & 17 deletions addons/sup_multispawn/fnc_multispawn.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,9 @@ switch(_operation) do {
case "loader": {
if !(isServer) exitwith {};

private ["_player","_transport","_timer"];

_player = [[_args], 0, objNull, [objNull]] call BIS_fnc_param;
private ["_transport","_timer"];
[_args] params [["_player", objNull, [objNull]]];
_factionData = [GVAR(STORE),faction _player] call ALiVE_fnc_HashGet;

[[_logic,"disablePlayer",_player], "ALiVE_fnc_MultiSpawn", owner _player, false] call BIS_fnc_MP;
Expand Down Expand Up @@ -466,9 +466,7 @@ switch(_operation) do {
case "enablePlayer": {
if !(hasInterface) exitwith {};

private ["_player"];

_player = [[_args], 0, objNull, [objNull]] call BIS_fnc_param;
[_args] params [["_player", objNull, [objNull]]];

if !(player == _player) exitwith {};

Expand All @@ -481,9 +479,9 @@ switch(_operation) do {
case "disablePlayer": {
if !(hasInterface) exitwith {};

private ["_player","_tgts"];
private ["_tgts"];

_player = [[_args], 0, objNull, [objNull]] call BIS_fnc_param;
[_args] params [["_player", objNull, [objNull]]];

if !(player == _player) exitwith {};

Expand All @@ -510,12 +508,8 @@ switch(_operation) do {
case "insert": {
if !(isServer) exitwith {};

private ["_StartPos","_EndPos","_transport","_TransportType","_side","_queue","_faction"];

_startPos = [_args, 0, [0,0,100], [[]]] call BIS_fnc_param;
_endPos = [_args, 1, getMarkerpos "Respawn_West", [[]]] call BIS_fnc_param;
_faction = [_args, 2, "BLU_F", [""]] call BIS_fnc_param;
_timeOut = [_args, 3, 30, [-1]] call BIS_fnc_param;
private ["_transport","_TransportType","_side","_queue"];
_args params [["_startPos", [0,0,100], [[]]], ["_endPos", getMarkerpos "Respawn_West", [[]]], ["_faction", "BLU_F", [""]], ["_timeOut"], 30, [-1]];
_time = time;

if (isnil "_faction") exitwith {["ALiVE_SUP_MULTISPAWN - faction not found when checking queue! Exiting queue..."]};
Expand Down Expand Up @@ -665,9 +659,9 @@ switch(_operation) do {
case "collect": {
if !(isServer) exitwith {};

private ["_player","_insertion","_destination","_transport","_timeout"];

_player = [[_args], 0, objNull, [objNull]] call BIS_fnc_param;
private ["_insertion","_destination","_transport","_timeout"];
[_args] params [["_player", objNull, [objNull]]];

_factionData = [GVAR(STORE),faction _player] call ALiVE_fnc_HashGet;
_transport = [_factionData,QGVAR(INSERTION_TRANSPORT)] call ALiVE_fnc_HashGet;
Expand Down
7 changes: 3 additions & 4 deletions addons/sup_player_resupply/fnc_PR.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,12 @@ Peer Reviewed:
#define PR_getSelData(ctrl) (lbData[##ctrl,(lbCurSel ##ctrl)])


private ["_logic","_operation","_args","_result"];
private ["_result"];

TRACE_1("PR - input",_this);

_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

_result = true;

switch(_operation) do {
Expand Down
7 changes: 3 additions & 4 deletions addons/sys_adminactions/fnc_adminActions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ nil
#define SUPERCLASS ALIVE_fnc_baseClass
#define MAINCLASS ALIVE_fnc_adminActions

private ["_logic","_operation","_args","_result"];
private ["_result"];

params [["_logic", objNull, [objNull]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

_logic = [_this, 0, objNull, [objNull]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
_result = true;

TRACE_3(QUOTE(ADDON),_logic, _operation, _args);
Expand Down
4 changes: 2 additions & 2 deletions addons/sys_adminactions/fnc_adminActionsTeleportUnits.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Peer Reviewed:
nil
---------------------------------------------------------------------------- */

private ["_unit","_input","_pos"];
private ["_unit","_pos", "_input"];

_input = [[_this], 0, ["CAManBase"], [[]]] call BIS_fnc_param;
_input = [_this] param [0, ["CAManBase"], [[]]];
_unit = objNull;

[] call ALIVE_fnc_markUnits;
Expand Down
7 changes: 3 additions & 4 deletions addons/sys_data/fnc_Data.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,10 @@ Tupolov
#define SUPERCLASS ALIVE_fnc_baseClassHash
#define MAINCLASS ALIVE_fnc_Data

private ["_result", "_operation", "_args", "_logic", "_ops"];
private ["_result","_ops"];

params [["_logic", objNull, [objNull,[]]], ["_operation", "", [""]], ["_args", objNull, [objNull,[],"",0,true,false]]];

_logic = [_this, 0, objNull, [objNull,[]]] call BIS_fnc_param;
_operation = [_this, 1, "", [""]] call BIS_fnc_param;
_args = [_this, 2, objNull, [objNull,[],"",0,true,false]] call BIS_fnc_param;
private _sourceOverride = param [3, "", [""]];

//TRACE_3("SYS_DATA",_logic, _operation, _args);
Expand Down
Loading