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

Fortify - Use ACEX-prefixed event names (#8553)

Browse Source
This commit is contained in:
jonpas
2021-10-18 18:54:10 +02:00
committed by GitHub
parent 38b8b5dfff
commit 73be44fbbf
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/fortify/XEH_postInit.sqf
View File

@ -2,7 +2,7 @@
if (isServer) then { if (isServer) then {
[QGVAR(registerObjects), LINKFUNC(registerObjects)] call CBA_fnc_addEventHandler; [QGVAR(registerObjects), LINKFUNC(registerObjects)] call CBA_fnc_addEventHandler;
[QGVAR(objectPlaced), { [QXGVAR(objectPlaced), {
params ["_unit", "_side", "_object"]; params ["_unit", "_side", "_object"];
TRACE_3("objectPlaced",_unit,_side,_object); TRACE_3("objectPlaced",_unit,_side,_object);
private _jipID = [QGVAR(addActionToObject), [_side, _object]] call CBA_fnc_globalEventJIP; private _jipID = [QGVAR(addActionToObject), [_side, _object]] call CBA_fnc_globalEventJIP;
@ -49,7 +49,7 @@ GVAR(objectRotationZ) = 0;
params ["_target", "_player", "_params"]; params ["_target", "_player", "_params"];
_params params ["_side"]; _params params ["_side"];
TRACE_2("deleting placed object",_target,_params); TRACE_2("deleting placed object",_target,_params);
[QGVAR(objectDeleted), [_player, _side, _target]] call CBA_fnc_globalEvent; [QXGVAR(objectDeleted), [_player, _side, _target]] call CBA_fnc_globalEvent;
deleteVehicle _target; deleteVehicle _target;
_params call FUNC(updateBudget); _params call FUNC(updateBudget);
}, },

2
addons/fortify/functions/fnc_deployConfirm.sqf
View File

@ -35,7 +35,7 @@ _newObject setPosASL _posASL;
_newObject setVectorDirAndUp [_vectorDir, _vectorUp]; _newObject setVectorDirAndUp [_vectorDir, _vectorUp];
// Server will use this event to run the jip compatible QGVAR(addActionToObject) event // Server will use this event to run the jip compatible QGVAR(addActionToObject) event
[QGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent; [QXGVAR(objectPlaced), [_unit, _side, _newObject]] call CBA_fnc_globalEvent;
if (cba_events_control) then { if (cba_events_control) then {
// Re-run if ctrl key held // Re-run if ctrl key held

2
addons/fortify/functions/fnc_deployObject.sqf
View File

@ -43,7 +43,7 @@ private _icons = [["alt", localize "str_3den_display3den_entitymenu_movesurface_
[_lmb, _rmb, _wheel, _icons] call EFUNC(interaction,showMouseHint); [_lmb, _rmb, _wheel, _icons] call EFUNC(interaction,showMouseHint);
private _mouseClickID = [_player, "DefaultAction", {GVAR(isPlacing) == PLACE_WAITING}, {GVAR(isPlacing) = PLACE_APPROVE}] call EFUNC(common,addActionEventHandler); private _mouseClickID = [_player, "DefaultAction", {GVAR(isPlacing) == PLACE_WAITING}, {GVAR(isPlacing) = PLACE_APPROVE}] call EFUNC(common,addActionEventHandler);
[QGVAR(onDeployStart), [_player, _object, _cost]] call CBA_fnc_localEvent; [QXGVAR(onDeployStart), [_player, _object, _cost]] call CBA_fnc_localEvent;
[{ [{
params ["_args", "_pfID"]; params ["_args", "_pfID"];