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

Pass the turret path too

Browse Source
This commit is contained in:
esteldunedain 2016-02-06 16:49:53 -03:00
parent 59cbc6da10
commit efbff8cc23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/common/functions/fnc_firedEH.sqf
View File

@ -36,7 +36,23 @@ if (_unit isKindOf "CAManBase") then {
};
} else {
// The unit is a vehicle
private _gunner = [_unit, _weapon] call EFUNC(common,getGunner);
// Get the gunner and turret path.
// Code based on FUNC(getGunner), extracted for efficency.
private _gunner = objNull;
private _turret = [];
{
if (_weapon in (_unit weaponsTurret _x)) exitWith {
_gunner = _unit turretUnit _x;
_turret = _x;
};
false
} count allTurrets [_unit, true];
// Ensure that at least the pilot is returned if there is no gunner
if (isManualFire _unit && {isNull _gunner}) then {
_gunner = driver _unit;
};
if (_gunner == ACE_player) then {
["firedPlayerVehicle", this] call FUNC(localEvent);
} else {

2
addons/fcs/functions/fnc_firedEH.sqf
View File

@ -12,8 +12,6 @@
*/
#include "script_component.hpp"
private _turret = _gunner call EFUNC(common,getTurretIndex);
private _FCSMagazines = _vehicle getVariable [format ["%1_%2", QGVAR(Magazines), _turret], []];
private _FCSElevation = _vehicle getVariable format ["%1_%2", QGVAR(Elevation), _turret];