Rename the explosive orientations events again:

- ace_explosives_clientRequestOrientations -> ace_explosives_sendOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_orientationsSent
This commit is contained in:
esteldunedain 2016-06-24 12:02:10 -03:00
parent 18f09b9310
commit 6f65155060
2 changed files with 10 additions and 10 deletions

View File

@ -29,16 +29,16 @@ if (isServer) then {
[_unit] call FUNC(onIncapacitated);
}] call CBA_fnc_addEventHandler;
[QGVAR(requestOrientations), {
[QGVAR(sendOrientations), {
params ["_logic"];
TRACE_1("requestOrientations received:",_logic);
TRACE_1("sendOrientations received:",_logic);
// Filter the array before sending it
GVAR(explosivesOrientations) = GVAR(explosivesOrientations) select {
_x params ["_explosive"];
(!isNull _explosive && {alive _explosive})
};
TRACE_1("sendOrientations sent:",GVAR(explosivesOrientations));
[QGVAR(sendOrientations), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent;
TRACE_1("orientationsSent sent:",GVAR(explosivesOrientations));
[QGVAR(orientationsSent), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent;
}] call CBA_fnc_addEventHandler;
};
@ -52,9 +52,9 @@ GVAR(CurrentSpeedDial) = 0;
// In case we are a JIP client, ask the server for orientation of any previously
// placed mine.
if (didJIP) then {
[QGVAR(sendOrientations), {
[QGVAR(orientationsSent), {
params ["_explosivesOrientations"];
TRACE_1("sendOrientations received:",_explosivesOrientations);
TRACE_1("orientationsSent received:",_explosivesOrientations);
{
_x params ["_explosive","_direction","_pitch"];
TRACE_3("orientation set:",_explosive,_direction,_pitch);
@ -66,8 +66,8 @@ if (didJIP) then {
// Create a logic to get the client ID
GVAR(localLogic) = ([sideLogic] call CBA_fnc_getSharedGroup) createUnit ["Logic", [0,0,0], [], 0, "NONE"];
TRACE_1("requestOrientations sent:",GVAR(localLogic));
[QGVAR(requestOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent;
TRACE_1("sendOrientations sent:",GVAR(localLogic));
[QGVAR(sendOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent;
};
["ace_interactMenuOpened", {

View File

@ -46,6 +46,6 @@ class CfgMineTriggers {
};
class ACE_newEvents {
clientRequestsOrientations = QGVAR(requestOrientations);
serverSendsOrientations = QGVAR(sendOrientations);
clientRequestsOrientations = QGVAR(sendOrientations);
serverSendsOrientations = QGVAR(orientationsSent);
};