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

Fix rearm turret events (#5307)

Browse Source
This commit is contained in:
PabstMirror 2017-07-10 10:17:44 -05:00 committed by jonpas
parent 16439f5640
commit c28628aed2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/rearm/XEH_postInit.sqf
View File

@ -19,7 +19,9 @@ if (isServer) then {
}; };
[QGVAR(makeDummyEH), LINKFUNC(makeDummy)] call CBA_fnc_addEventHandler; [QGVAR(makeDummyEH), LINKFUNC(makeDummy)] call CBA_fnc_addEventHandler;
[QGVAR(rearmEntireVehicleSuccessEH), LINKFUNC(rearmEntireVehicleSuccess)] call CBA_fnc_addEventHandler;
[QGVAR(rearmEntireVehicleSuccessLocalEH), LINKFUNC(rearmEntireVehicleSuccessLocal)] call CBA_fnc_addEventHandler; [QGVAR(rearmEntireVehicleSuccessLocalEH), LINKFUNC(rearmEntireVehicleSuccessLocal)] call CBA_fnc_addEventHandler;
[QGVAR(rearmSuccessEH), LINKFUNC(rearmSuccess)] call CBA_fnc_addEventHandler;
[QGVAR(rearmSuccessLocalEH), LINKFUNC(rearmSuccessLocal)] call CBA_fnc_addEventHandler; [QGVAR(rearmSuccessLocalEH), LINKFUNC(rearmSuccessLocal)] call CBA_fnc_addEventHandler;

10
addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
View File

@ -18,21 +18,19 @@
#include "script_component.hpp" #include "script_component.hpp"
params ["_args"]; params ["_args"];
_args params [ _args params [["_truck", objNull, [objNull]], ["_vehicle", objNull, [objNull]]];
["_truck", objNull, [objNull]], TRACE_2("rearmEntireVehicleSuccess",_truck,_vehicle);
["_vehicle", objNull, [objNull]]
];
if (isServer) then { if (isServer) then {
{ {
private _turretOwnerID = _vehicle turretOwner _x; private _turretOwnerID = _vehicle turretOwner _x;
if (_turretOwnerID == 0) then { if (_turretOwnerID == 0) then {
[QGVAR(rearmEntireVehicleSuccessLocalEH), [_truck, _vehicle, _x], _truck] call CBA_fnc_targetEvent; [QGVAR(rearmEntireVehicleSuccessLocalEH), [_truck, _vehicle, _x], [_vehicle]] call CBA_fnc_targetEvent;
} else { } else {
[QGVAR(rearmEntireVehicleSuccessLocalEH), [_truck, _vehicle, _x], _turretOwnerID] call CBA_fnc_ownerEvent; [QGVAR(rearmEntireVehicleSuccessLocalEH), [_truck, _vehicle, _x], _turretOwnerID] call CBA_fnc_ownerEvent;
}; };
false false
} count REARM_TURRET_PATHS; } count REARM_TURRET_PATHS;
} else { } else {
[QGVAR(rearmEntireVehicleSuccessLocalEH), _this] call CBA_fnc_serverEvent; [QGVAR(rearmEntireVehicleSuccessEH), _this] call CBA_fnc_serverEvent;
}; };

2
addons/rearm/functions/fnc_rearmSuccess.sqf
View File

@ -38,5 +38,5 @@ if (isServer) then {
[QGVAR(rearmSuccessLocalEH), _this, _turretOwnerID] call CBA_fnc_ownerEvent; [QGVAR(rearmSuccessLocalEH), _this, _turretOwnerID] call CBA_fnc_ownerEvent;
}; };
} else { } else {
[QGVAR(rearmSuccessLocalEH), _this] call EFUNC(common,serverEvent); [QGVAR(rearmSuccessEH), _this] call CBA_fnc_serverEvent;
}; };