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

Made more modules use assignObjectsInList common function

Browse Source
This commit is contained in:
jonpas 2015-08-24 21:55:48 +02:00
parent ef2924623f
commit 5b6429f23e
5 changed files with 30 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
View File

@ -1,63 +1,26 @@
/*
* Author: Glowbal
* Assign a medical role to a unit
* Assign a medical role to a unit.
*
* Arguments:
* 0: The module logic <LOGIC>
* 1: units <ARRAY>
* 2: activated <BOOL>
* 0: The module logic <OBJECT>
* 1: Synchronized units <ARRAY>
* 2: Activated <BOOL>
*
* Return Value:
* None <NIL>
*
* Public: No
*/
#include "script_component.hpp"
private ["_logic","_setting","_objects", "_list", "_splittedList", "_nilCheckPassedList", "_parsedList"];
_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
params ["_logic"];
if (!isNull _logic) then {
_list = _logic getvariable ["EnableList",""];
private ["_list", "_setting"];
_list = _logic getVariable ["EnableList", ""];
_setting = _logic getVariable ["role", 0];
_splittedList = [_list, ","] call BIS_fnc_splitString;
_nilCheckPassedList = "";
{
_x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
if !(isnil _x) then {
if (_nilCheckPassedList == "") then {
_nilCheckPassedList = _x;
} else {
_nilCheckPassedList = _nilCheckPassedList + ","+ _x;
};
};
}foreach _splittedList;
_list = "[" + _nilCheckPassedList + "]";
_parsedList = [] call compile _list;
_setting = _logic getvariable ["role",0];
_objects = synchronizedObjects _logic;
if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
{
if (!isnil "_x") then {
if (typeName _x == typeName objNull) then {
if (local _x) then {
_x setvariable [QGVAR(medicClass), _setting, true];
};
};
};
}foreach _objects;
};
{
if (!isnil "_x") then {
if (typeName _x == typeName objNull) then {
if (local _x) then {
_x setvariable [QGVAR(medicClass), _setting, true];
};
};
};
}foreach _parsedList;
};
true
[_list, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
[synchronizedObjects _logic, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
};

60
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
View File

@ -1,64 +1,26 @@
/*
* Author: Glowbal
* Assign vehicle as a medical vehicle
* Assign vehicle as a medical vehicle.
*
* Arguments:
* 0: The module logic <LOGIC>
* 1: units <ARRAY>
* 2: activated <BOOL>
* 0: The module logic <OBJECT>
* 1: Synchronized units <ARRAY>
* 2: Activated <BOOL>
*
* Return Value:
* None <NIL>
*
* Public: No
*/
#include "script_component.hpp"
private ["_logic","_setting","_objects", "_list", "_splittedList", "_nilCheckPassedList", "_parsedList"];
_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
params ["_logic"];
if (!isNull _logic) then {
_list = _logic getvariable ["EnableList",""];
private ["_list", "_setting"];
_list = _logic getVariable ["EnableList", ""];
_setting = _logic getVariable ["enabled", 0];
_splittedList = [_list, ","] call BIS_fnc_splitString;
_nilCheckPassedList = "";
{
_x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
if !(isnil _x) then {
if (_nilCheckPassedList == "") then {
_nilCheckPassedList = _x;
} else {
_nilCheckPassedList = _nilCheckPassedList + ","+ _x;
};
};
}foreach _splittedList;
_list = "[" + _nilCheckPassedList + "]";
_parsedList = [] call compile _list;
_setting = _logic getvariable ["enabled", 0];
_objects = synchronizedObjects _logic;
if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
{
if (!isnil "_x") then {
if (typeName _x == typeName objNull) then {
if (local _x) then {
_x setvariable [QGVAR(medicClass), _setting, true];
};
};
};
}foreach _objects;
};
{
if (!isnil "_x") then {
if (typeName _x == typeName objNull) then {
if (local _x) then {
_x setvariable [QGVAR(medicClass), _setting, true];
};
};
};
}foreach _parsedList;
};
true;
[_list, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
[synchronizedObjects _logic, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
};

8
addons/repair/functions/fnc_moduleAssignEngineer.sqf
View File

@ -21,11 +21,9 @@ params ["_logic"];
if (!isNull _logic) then {
private ["_list", "_setting"];
_list = _logic getVariable ["EnableList",""];
_setting = _logic getVariable ["role",0];
_list = _logic getVariable ["EnableList", ""];
_setting = _logic getVariable ["role", 0];
[_list, "ACE_IsEngineer", _setting, true] call EFUNC(common,assignObjectsInList);
[synchronizedObjects _logic, "ACE_IsEngineer", _setting, true] call EFUNC(common,assignObjectsInList);
};
true
};

6
addons/repair/functions/fnc_moduleAssignRepairFacility.sqf
View File

@ -21,11 +21,9 @@ params ["_logic"];
if (!isNull _logic) then {
private ["_list", "_setting"];
_list = _logic getVariable ["EnableList",""];
_setting = _logic getVariable ["role",0];
_list = _logic getVariable ["EnableList", ""];
_setting = _logic getVariable ["role", 0];
[_list, "ACE_isRepairFacility", _setting, true] call EFUNC(common,assignObjectsInList);
[synchronizedObjects _logic, "ACE_isRepairFacility", _setting, true] call EFUNC(common,assignObjectsInList);
};
true

8
addons/repair/functions/fnc_moduleAssignRepairVehicle.sqf
View File

@ -21,11 +21,9 @@ params ["_logic"];
if (!isNull _logic) then {
private ["_list", "_setting"];
_list = _logic getVariable ["EnableList",""];
_setting = _logic getVariable ["role",0];
_list = _logic getVariable ["EnableList", ""];
_setting = _logic getVariable ["role", 0];
[_list, "ACE_isRepairVehicle", _setting, true] call EFUNC(common,assignObjectsInList);
[synchronizedObjects _logic, "ACE_isRepairVehicle", _setting, true] call EFUNC(common,assignObjectsInList);
};
true
};