From 73be44fbbfa16198bfe3b1c94cc74b52958bf523 Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 18 Oct 2021 18:54:10 +0200 Subject: [PATCH] Fortify - Use ACEX-prefixed event names (#8553) --- addons/fortify/XEH_postInit.sqf | 4 ++-- addons/fortify/functions/fnc_deployConfirm.sqf | 2 +- addons/fortify/functions/fnc_deployObject.sqf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/fortify/XEH_postInit.sqf b/addons/fortify/XEH_postInit.sqf index 17e1e60c76..f14c4cb8f7 100644 --- a/addons/fortify/XEH_postInit.sqf +++ b/addons/fortify/XEH_postInit.sqf @@ -2,7 +2,7 @@ if (isServer) then { [QGVAR(registerObjects), LINKFUNC(registerObjects)] call CBA_fnc_addEventHandler; - [QGVAR(objectPlaced), { + [QXGVAR(objectPlaced), { params ["_unit", "_side", "_object"]; TRACE_3("objectPlaced",_unit,_side,_object); private _jipID = [QGVAR(addActionToObject), [_side, _object]] call CBA_fnc_globalEventJIP; @@ -49,7 +49,7 @@ GVAR(objectRotationZ) = 0; params ["_target", "_player", "_params"]; _params params ["_side"]; 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; _params call FUNC(updateBudget); }, diff --git a/addons/fortify/functions/fnc_deployConfirm.sqf b/addons/fortify/functions/fnc_deployConfirm.sqf index 775d0aad51..d04124fd93 100644 --- a/addons/fortify/functions/fnc_deployConfirm.sqf +++ b/addons/fortify/functions/fnc_deployConfirm.sqf @@ -35,7 +35,7 @@ _newObject setPosASL _posASL; _newObject setVectorDirAndUp [_vectorDir, _vectorUp]; // 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 { // Re-run if ctrl key held diff --git a/addons/fortify/functions/fnc_deployObject.sqf b/addons/fortify/functions/fnc_deployObject.sqf index 8ed404e7d6..cff46df6d9 100644 --- a/addons/fortify/functions/fnc_deployObject.sqf +++ b/addons/fortify/functions/fnc_deployObject.sqf @@ -43,7 +43,7 @@ private _icons = [["alt", localize "str_3den_display3den_entitymenu_movesurface_ [_lmb, _rmb, _wheel, _icons] call EFUNC(interaction,showMouseHint); 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"];