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

Merge pull request #3809 from acemod/improve_getTurretX

Browse Source 
fullCrew new parameter to improve FUNC(getTurretX)
This commit is contained in:
commy2 2016-05-22 17:02:45 +02:00
commit 36205e3864
6 changed files with 12 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/common/functions/fnc_getTurretCommander.sqf
View File

@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]]; params [["_vehicle", objNull, [objNull]]];
private _turrets = allTurrets [_vehicle, true]; fullCrew [_vehicle, "commander", true] apply {_x select 3} param [0, []] // return
private _turret = [];
{
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_config = [_config, _x] call FUNC(getTurretConfigPath);
if (getNumber (_config >> "primaryObserver") == 1) exitWith {
_turret = _x;
};
false
} count _turrets;
_turret

19
addons/common/functions/fnc_getTurretCopilot.sqf
View File

@ -14,19 +14,6 @@
params [["_vehicle", objNull, [objNull]]]; params [["_vehicle", objNull, [objNull]]];
private _turrets = allTurrets [_vehicle, true]; fullCrew [_vehicle, "turret", true] apply {_x select 3} select {
getNumber ([_vehicle, _x] call CBA_fnc_getTurret >> "isCopilot") == 1
private _turret = []; } param [0, []] // return
{
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_config = [_config, _x] call FUNC(getTurretConfigPath);
if (getNumber (_config >> "isCopilot") == 1 && {getNumber (_config >> "primaryGunner") != 1} && {getNumber (_config >> "primaryObserver") != 1}) exitWith {
_turret = _x;
};
false
} count _turrets;
_turret

17
addons/common/functions/fnc_getTurretGunner.sqf
View File

@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]]; params [["_vehicle", objNull, [objNull]]];
private _turrets = allTurrets [_vehicle, true]; fullCrew [_vehicle, "gunner", true] apply {_x select 3} param [0, []] // return
private _turret = [];
{
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_config = [_config, _x] call FUNC(getTurretConfigPath);
if (getNumber (_config >> "primaryGunner") == 1) exitWith {
_turret = _x;
};
false
} count _turrets;
_turret

4
addons/common/functions/fnc_getTurrets.sqf
View File

@ -8,12 +8,14 @@
* Return Value: * Return Value:
* Turret Indecies <ARRAY> * Turret Indecies <ARRAY>
* *
* Public: Yes * Public: No
* *
* Note: It's advised to use allTurrets [_vehicle, true] instead whenever possible * Note: It's advised to use allTurrets [_vehicle, true] instead whenever possible
*/ */
#include "script_component.hpp" #include "script_component.hpp"
ACE_DEPRECATED("ace_common_fnc_getTurrets","3.7.0","allTurrets [_vehicle, true]");
params ["_type"]; params ["_type"];
private _varName = format [QGVAR(CachedTurrets_%1), _type]; private _varName = format [QGVAR(CachedTurrets_%1), _type];

17
addons/common/functions/fnc_getTurretsFFV.sqf
View File

@ -14,19 +14,4 @@
params [["_vehicle", objNull, [objNull]]]; params [["_vehicle", objNull, [objNull]]];
private _turrets = allTurrets [_vehicle, true]; fullCrew [_vehicle, "turret", true] select {_x select 4} apply {_x select 3} // return
private _turret = [];
{
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_config = [_config, _x] call FUNC(getTurretConfigPath);
if (getNumber (_config >> "isPersonTurret") == 1) then {
_turret pushBack _x;
};
false
} count _turrets;
_turret

24
addons/common/functions/fnc_getTurretsOther.sqf
View File

@ -14,24 +14,6 @@
params [["_vehicle", objNull, [objNull]]]; params [["_vehicle", objNull, [objNull]]];
private _turrets = allTurrets [_vehicle, true]; fullCrew [_vehicle, "turret", true] select {!(_x select 4)} apply {_x select 3} select {
getNumber ([_vehicle, _x] call CBA_fnc_getTurret >> "isCopilot") != 1
private _turret = []; } // return
{
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_config = [_config, _x] call FUNC(getTurretConfigPath);
if (
getNumber (_config >> "isCopilot") != 1
&& {getNumber (_config >> "primaryGunner") != 1}
&& {getNumber (_config >> "primaryObserver") != 1}
&& {getNumber (_config >> "isPersonTurret") != 1}
) then {
_turret pushBack _x;
};
false
} count _turrets;
_turret