diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf index 8cbb93d059..ae3ab5a639 100644 --- a/addons/captives/XEH_postInit.sqf +++ b/addons/captives/XEH_postInit.sqf @@ -32,7 +32,7 @@ if (isServer) then { [QGVAR(setSurrendered), {_this call FUNC(setSurrendered)}] call CBA_fnc_addEventHandler; //Medical Integration Events -["ace_medical_onUnconscious", {_this call ACE_Captives_fnc_handleOnUnconscious}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call ACE_Captives_fnc_handleOnUnconscious}] call CBA_fnc_addEventHandler; if (!hasInterface) exitWith {}; diff --git a/addons/captives/config.cpp b/addons/captives/config.cpp index 85378a6d4c..41adbb3228 100644 --- a/addons/captives/config.cpp +++ b/addons/captives/config.cpp @@ -22,7 +22,7 @@ class CfgPatches { class ACE_newEvents { SettingsInitialized = "ace_settingsInitialized"; - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); SetSurrendered = QGVAR(setSurrendered); SetHandcuffed = QGVAR(setHandcuffed); MoveOutCaptive = QGVAR(moveOutCaptive); diff --git a/addons/dragging/XEH_postInit.sqf b/addons/dragging/XEH_postInit.sqf index d6157edd35..fedb6fee9c 100644 --- a/addons/dragging/XEH_postInit.sqf +++ b/addons/dragging/XEH_postInit.sqf @@ -25,6 +25,6 @@ if (isNil "ACE_maxWeightCarry") then { ["ace_playerWeaponChanged", {_this call FUNC(handlePlayerWeaponChanged)}] call CBA_fnc_addEventHandler; // handle waking up dragged unit and falling unconscious while dragging -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; //@todo Captivity? diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp index 2b6b27b956..adb4649651 100644 --- a/addons/dragging/config.cpp +++ b/addons/dragging/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgMovesBasic.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); playerWeaponChanged = "ace_playerWeaponChanged"; playerVehicleChanged = "ace_playerVehicleChanged"; playerChanged = "ace_playerChanged"; diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf index 6900953a31..91887d247d 100644 --- a/addons/explosives/XEH_postInit.sqf +++ b/addons/explosives/XEH_postInit.sqf @@ -22,7 +22,7 @@ //When getting knocked out in medical, trigger deadman explosives: //Event is global, only run on server (ref: ace_medical_fnc_setUnconscious) if (isServer) then { - ["ace_medical_onUnconscious", { + [QEGVAR(medical,unconscious), { params ["_unit", "_isUnconscious"]; if (!_isUnconscious) exitWith {}; TRACE_1("Knocked Out, Doing Deadman", _unit); diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp index 06487f002b..09a814dae6 100644 --- a/addons/explosives/config.cpp +++ b/addons/explosives/config.cpp @@ -45,7 +45,7 @@ class CfgMineTriggers { }; class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); clientRequestsOrientations = QGVAR(clientRequestOrientations); serverSendsOrientations = QGVAR(serverSendOrientations); }; diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index 26617c25b9..e703653efb 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -41,7 +41,7 @@ GVAR(ParsedTextCached) = []; // Listens for the falling unconscious event, just in case the menu needs to be closed -["ace_medical_onUnconscious", { +[QEGVAR(medical,unconscious), { // If no menu is open just quit if (GVAR(openedMenuType) < 0) exitWith {}; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 0d9d33f22a..82f367ffdd 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -6,8 +6,6 @@ GVAR(heartBeatSounds_Fast) = ["ACE_heartbeat_fast_1", "ACE_heartbeat_fast_2", "A GVAR(heartBeatSounds_Normal) = ["ACE_heartbeat_norm_1", "ACE_heartbeat_norm_2"]; GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; -["ace_medical_propagateWound", FUNC(onPropagateWound)] call CBA_fnc_addEventHandler; -["ace_medical_woundUpdateRequest", FUNC(onWoundUpdateRequest)] call CBA_fnc_addEventHandler; ["ace_interactMenuClosed", {[objNull, false] call FUNC(displayPatientInformation); }] call CBA_fnc_addEventHandler; //Treatment EventHandlers: @@ -31,9 +29,9 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; ["ace_actionPlaceInBodyBag", FUNC(actionPlaceInBodyBag)] call CBA_fnc_addEventHandler; //Handle Deleting Bodies on Server: -if (isServer) then {["ace_placedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;}; +if (isServer) then {[QGVAR(playedInBodyBag), FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;}; -["ace_medical_onUnconscious", { +[QGVAR(unconscious), { params ["_unit", "_status"]; if (local _unit) then { if (_status) then { diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp index 533af19e8e..812e52f6dd 100644 --- a/addons/medical/config.cpp +++ b/addons/medical/config.cpp @@ -26,9 +26,14 @@ class CfgPatches { #include "UI\triagecard.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; - playerInventoryChanged = "ace_playerInventoryChanged"; - placedInBodyBag = "ace_placedInBodyBag"; + medical_onUnconscious = QGVAR(unconscious); + medical_treatmentSuccess = QGVAR(treatmentSuccess); + medical_onSetDead = QGVAR(killed); + Medical_onEnteredCardiacArrest = QGVAR(enteredCardiacArrest); + Medical_onItemAddedToTriageCard = QGVAR(itemAddedToTriageCard); + medical_onLogEntryAdded = QGVAR(logEntryAdded); + Medical_onHeartRateAdjustmentAdded = QGVAR(addedHeartRateAdjustment); + placedInBodyBag = QGVAR(playedInBodyBag); actionPlaceInBodyBag = "ace_actionPlaceInBodyBag"; treatmentTourniquetLocal = "ace_treatmentTourniquetLocal"; treatmentIVLocal = "ace_treatmentIVLocal"; @@ -47,18 +52,5 @@ class ACE_newEvents { addToInjuredCollection = "ace_addToInjuredCollection"; actionCheckPulseLocal = "ace_actionCheckPulseLocal"; actionCheckBloodPressureLocal = "ace_actionCheckBloodPressureLocal"; - interactMenuClosed = "ace_interactMenuClosed"; - medical_woundUpdateRequest = "ace_medical_woundUpdateRequest"; - medical_propagateWound = "ace_medical_propagateWound"; - useItem = "ace_useItem"; - medical_treatmentSuccess = "ace_medical_treatmentSuccess"; - displayTextStructured = "ace_displayTextStructured"; - medical_onSetDead = "ace_medical_onSetDead"; - Medical_onEnteredCardiacArrest = "ace_medical_onEnteredCardiacArrest"; - hideObjectGlobal = "ace_hideObjectGlobal"; addVitalLoop = "ace_addVitalLoop"; - Medical_onItemAddedToTriageCard = "ace_medical_onItemAddedToTriageCard"; - medical_onLogEntryAdded = "ace_medical_onLogEntryAdded"; - Medical_onHeartRateAdjustmentAdded = "ace_medical_onHeartRateAdjustmentAdded"; - unloadPersonEvent = "ace_unloadPersonEvent"; }; diff --git a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf index 9d87b6ea50..c8f6de3628 100644 --- a/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf +++ b/addons/medical/functions/fnc_actionPlaceInBodyBag.sqf @@ -47,6 +47,6 @@ private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, ""]; _bodyBag setPosASL _position; _bodyBag setDir _direction; -["ace_placedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server +[QGVAR(playedInBodyBag), [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server _bodyBag diff --git a/addons/medical/functions/fnc_addHeartRateAdjustment.sqf b/addons/medical/functions/fnc_addHeartRateAdjustment.sqf index 2665a1cb7c..1b214ec99a 100644 --- a/addons/medical/functions/fnc_addHeartRateAdjustment.sqf +++ b/addons/medical/functions/fnc_addHeartRateAdjustment.sqf @@ -22,4 +22,4 @@ params [["_unit", objNull, [objNull]], ["_value", 0, [0]], ["_time", 1, [0]], [" _adjustment = _unit getVariable [QGVAR(heartRateAdjustments), []]; _adjustment pushBack [_value, _time, _callBack]; _unit setVariable [QGVAR(heartRateAdjustments), _adjustment ]; -["ace_medical_onHeartRateAdjustmentAdded", [_unit, _value, _time]] call CBA_fnc_localEvent; +[QGVAR(addedHeartRateAdjustment), [_unit, _value, _time]] call CBA_fnc_localEvent; diff --git a/addons/medical/functions/fnc_addToLog.sqf b/addons/medical/functions/fnc_addToLog.sqf index d01a99202e..ab0d993c56 100644 --- a/addons/medical/functions/fnc_addToLog.sqf +++ b/addons/medical/functions/fnc_addToLog.sqf @@ -43,7 +43,7 @@ if (count _log >= 8) then { _log pushBack [_message, _moment, _type, _arguments]; _unit setVariable [_logVarName, _log, true]; -["ace_medical_onLogEntryAdded", [_unit, _type, _message, _arguments]] call CBA_fnc_localEvent; +[QGVAR(logEntryAdded), [_unit, _type, _message, _arguments]] call CBA_fnc_localEvent; _logs = _unit getVariable [QGVAR(allLogs), []]; if !(_logVarName in _logs) then { diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf index 0db54cb692..cae1dd35cf 100644 --- a/addons/medical/functions/fnc_addToTriageCard.sqf +++ b/addons/medical/functions/fnc_addToTriageCard.sqf @@ -41,4 +41,4 @@ if (!_inList) then { _log pushBack [_newItem, 1, CBA_missionTime]; }; _unit setVariable [QGVAR(triageCard), _log, true]; -["ace_medical_onItemAddedToTriageCard", [_unit, _newItem, _amount]] call CBA_fnc_localEvent; +[QGVAR(itemAddedToTriageCard), [_unit, _newItem, _amount]] call CBA_fnc_localEvent; diff --git a/addons/medical/functions/fnc_setCardiacArrest.sqf b/addons/medical/functions/fnc_setCardiacArrest.sqf index fe2a0b81a0..9522eeaec4 100644 --- a/addons/medical/functions/fnc_setCardiacArrest.sqf +++ b/addons/medical/functions/fnc_setCardiacArrest.sqf @@ -21,7 +21,7 @@ if (_unit getVariable [QGVAR(inCardiacArrest),false]) exitWith {}; _unit setVariable [QGVAR(inCardiacArrest), true,true]; _unit setVariable [QGVAR(heartRate), 0]; -["ace_medical_onEnteredCardiacArrest", [_unit]] call CBA_fnc_localEvent; +[QGVAR(enteredCardiacArrest), [_unit]] call CBA_fnc_localEvent; [_unit, true] call FUNC(setUnconscious); _timeInCardiacArrest = 120 + round(random(600)); diff --git a/addons/medical/functions/fnc_setDead.sqf b/addons/medical/functions/fnc_setDead.sqf index 422850f1b3..6d51ec2bac 100644 --- a/addons/medical/functions/fnc_setDead.sqf +++ b/addons/medical/functions/fnc_setDead.sqf @@ -51,7 +51,7 @@ if (isPLayer _unit) then { _unit setVariable ["isDeadPlayer", true, true]; }; -["ace_medical_onSetDead", [_unit]] call CBA_fnc_localEvent; +[QGVAR(killed), [_unit]] call CBA_fnc_localEvent; //Delay a frame before killing the unit via scripted damage //to avoid triggering the "Killed" Event twice (and having the wrong killer) diff --git a/addons/medical/functions/fnc_setUnconscious.sqf b/addons/medical/functions/fnc_setUnconscious.sqf index 5de1aa1a0c..adee89e4fe 100644 --- a/addons/medical/functions/fnc_setUnconscious.sqf +++ b/addons/medical/functions/fnc_setUnconscious.sqf @@ -122,4 +122,4 @@ _startingTime = CBA_missionTime; // unconscious can't talk [_unit, "isUnconscious"] call EFUNC(common,muteUnit); -["ace_medical_onUnconscious", [_unit, true]] call CBA_fnc_globalEvent; +[QGVAR(unconscious), [_unit, true]] call CBA_fnc_globalEvent; diff --git a/addons/medical/functions/fnc_treatment_success.sqf b/addons/medical/functions/fnc_treatment_success.sqf index 0a857c1f18..04fec2b5bd 100644 --- a/addons/medical/functions/fnc_treatment_success.sqf +++ b/addons/medical/functions/fnc_treatment_success.sqf @@ -95,4 +95,4 @@ if (!(_target getVariable [QGVAR(addedToUnitLoop),false])) then { [_target] call FUNC(addVitalLoop); }; -["ace_medical_treatmentSuccess", [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent; +[QGVAR(treatmentSuccess), [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent; diff --git a/addons/medical/functions/fnc_unconsciousPFH.sqf b/addons/medical/functions/fnc_unconsciousPFH.sqf index 34d2ffd321..0e80d49457 100644 --- a/addons/medical/functions/fnc_unconsciousPFH.sqf +++ b/addons/medical/functions/fnc_unconsciousPFH.sqf @@ -39,7 +39,7 @@ if (!alive _unit) exitWith { _unit setUnconscious false; [_unit, "isUnconscious"] call EFUNC(common,unmuteUnit); - ["ace_medical_onUnconscious", [_unit, false]] call CBA_fnc_globalEvent; + [QGVAR(unconscious), [_unit, false]] call CBA_fnc_globalEvent; TRACE_3("ACE_DEBUG_Unconscious_Exit",_unit, (!alive _unit) , QGVAR(unconscious)); @@ -96,7 +96,7 @@ if !(_unit getVariable ["ACE_isUnconscious",false]) exitWith { }; _unit setVariable [QGVAR(vehicleAwakeAnim), nil]; - ["ace_medical_onUnconscious", [_unit, false]] call CBA_fnc_globalEvent; + [QGVAR(unconscious), [_unit, false]] call CBA_fnc_globalEvent; // EXIT PFH [_idPFH] call CBA_fnc_removePerFrameHandler; }; diff --git a/addons/medical_menu/XEH_postInit.sqf b/addons/medical_menu/XEH_postInit.sqf index 746521fabf..046abfdaad 100644 --- a/addons/medical_menu/XEH_postInit.sqf +++ b/addons/medical_menu/XEH_postInit.sqf @@ -6,7 +6,7 @@ GVAR(MenuPFHID) = -1; GVAR(lastOpenedOn) = -1; GVAR(pendingReopen) = false; -["ace_medical_treatmentSuccess", { +[QEGVAR(medical,treatmentSuccess), { if (GVAR(openAfterTreatment) && {GVAR(pendingReopen)}) then { GVAR(pendingReopen) = false; diff --git a/addons/medical_menu/config.cpp b/addons/medical_menu/config.cpp index ec1840c696..a33dbe9235 100644 --- a/addons/medical_menu/config.cpp +++ b/addons/medical_menu/config.cpp @@ -19,7 +19,7 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_newEvents { - medical_treatmentSuccess = "ace_medical_treatmentSuccess"; - Medical_onMenuOpen = "ace_medical_onMenuOpen"; + medical_treatmentSuccess = QEGVAR(medical,treatmentSuccess); + Medical_onMenuOpen = QGVAR(opened); displayTextStructured = "ace_displayTextStructured"; }; diff --git a/addons/medical_menu/functions/fnc_onMenuOpen.sqf b/addons/medical_menu/functions/fnc_onMenuOpen.sqf index 33e934afe5..ed33b2d321 100644 --- a/addons/medical_menu/functions/fnc_onMenuOpen.sqf +++ b/addons/medical_menu/functions/fnc_onMenuOpen.sqf @@ -87,4 +87,4 @@ GVAR(MenuPFHID) = [{ }, 0, [_display]] call CBA_fnc_addPerFrameHandler; -["ace_medical_onMenuOpen", [ACE_player, _target]] call CBA_fnc_localEvent; +[QGVAR(opened), [ACE_player, _target]] call CBA_fnc_localEvent; diff --git a/addons/rearm/XEH_postInit.sqf b/addons/rearm/XEH_postInit.sqf index d49af32eab..7c89e90ac1 100644 --- a/addons/rearm/XEH_postInit.sqf +++ b/addons/rearm/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; ["ace_playerVehicleChanged", {params ["_unit"]; [_unit] call FUNC(dropAmmo)}] call CBA_fnc_addEventHandler; if (isServer) then { diff --git a/addons/rearm/config.cpp b/addons/rearm/config.cpp index d057ba2acf..0d4ec30baa 100644 --- a/addons/rearm/config.cpp +++ b/addons/rearm/config.cpp @@ -22,5 +22,5 @@ class CfgPatches { class ACE_newEvents { playerVehicleChanged = "ace_playerVehicleChanged"; - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); }; diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf index b55575e72c..866f50dbd8 100644 --- a/addons/refuel/XEH_postInit.sqf +++ b/addons/refuel/XEH_postInit.sqf @@ -1,6 +1,6 @@ #include "script_component.hpp" -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; if (isServer) then { addMissionEventHandler ["HandleDisconnect", {_this call FUNC(handleDisconnect)}]; diff --git a/addons/refuel/config.cpp b/addons/refuel/config.cpp index 8e3279c3fe..1517ab7006 100644 --- a/addons/refuel/config.cpp +++ b/addons/refuel/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgVehicles.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); setFuel = "ace_setFuel"; setVectorDirAndUp = "ace_setVectorDirAndUp"; displayTextStructured = "ace_displayTextStructured"; diff --git a/addons/sandbag/XEH_postInit.sqf b/addons/sandbag/XEH_postInit.sqf index 74a8e67b74..e65928c48e 100644 --- a/addons/sandbag/XEH_postInit.sqf +++ b/addons/sandbag/XEH_postInit.sqf @@ -20,6 +20,6 @@ GVAR(deployDirection) = 0; ["ace_playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addEventHandler; // handle waking up dragged unit and falling unconscious while dragging -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; //@todo Captivity? diff --git a/addons/sandbag/config.cpp b/addons/sandbag/config.cpp index 0c4033e281..6ad3e212d8 100644 --- a/addons/sandbag/config.cpp +++ b/addons/sandbag/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgWeapons.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); playerVehicleChanged = "ace_playerVehicleChanged"; playerInventoryChanged = "ace_playerInventoryChanged"; playerChanged = "ace_playerChanged"; diff --git a/addons/sitting/XEH_clientInit.sqf b/addons/sitting/XEH_clientInit.sqf index 41ac0d258b..58a926022b 100644 --- a/addons/sitting/XEH_clientInit.sqf +++ b/addons/sitting/XEH_clientInit.sqf @@ -12,6 +12,6 @@ if (!hasInterface) exitWith {}; ["isNotSitting", {isNil {(_this select 0) getVariable QGVAR(isSitting)}}] call EFUNC(common,addCanInteractWithCondition); // Handle interruptions - ["ace_medical_onUnconscious", {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler; + [QEGVAR(medical,unconscious), {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler; [QEGVAR(captives,setHandcuffed), {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler; }] call CBA_fnc_addEventHandler; diff --git a/addons/sitting/config.cpp b/addons/sitting/config.cpp index 1fd81ad5d1..26d013179e 100644 --- a/addons/sitting/config.cpp +++ b/addons/sitting/config.cpp @@ -21,5 +21,5 @@ class CfgPatches { class ACE_newEvents { SettingsInitialized = "ace_settingsInitialized"; SetHandcuffed = QEGVAR(captives,setHandcuffed); - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); }; \ No newline at end of file diff --git a/addons/tacticalladder/XEH_postInit.sqf b/addons/tacticalladder/XEH_postInit.sqf index 3820188d52..902d73f9ab 100644 --- a/addons/tacticalladder/XEH_postInit.sqf +++ b/addons/tacticalladder/XEH_postInit.sqf @@ -21,6 +21,6 @@ GVAR(currentAngle) = 0; ["ace_playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addEventHandler; // handle falling unconscious -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; // @todo captivity? diff --git a/addons/tacticalladder/config.cpp b/addons/tacticalladder/config.cpp index ed0f933c9b..38f47b40ea 100644 --- a/addons/tacticalladder/config.cpp +++ b/addons/tacticalladder/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { class ACE_newEvents { interactMenuOpened = "ace_interactMenuOpened"; - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); playerVehicleChanged = "ace_playerVehicleChanged"; playerChanged = "ace_playerChanged"; }; diff --git a/addons/trenches/XEH_postInit.sqf b/addons/trenches/XEH_postInit.sqf index 6fb3c9b33f..02de7f02c1 100644 --- a/addons/trenches/XEH_postInit.sqf +++ b/addons/trenches/XEH_postInit.sqf @@ -21,6 +21,6 @@ GVAR(digDirection) = 0; ["ace_playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addEventHandler; // handle waking up dragged unit and falling unconscious while dragging -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; //@todo Captivity? diff --git a/addons/trenches/config.cpp b/addons/trenches/config.cpp index f173d16628..0486a71509 100644 --- a/addons/trenches/config.cpp +++ b/addons/trenches/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgWeapons.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); playerVehicleChanged = "ace_playerVehicleChanged"; playerInventoryChanged = "ace_playerInventoryChanged"; playerChanged = "ace_playerChanged"; diff --git a/addons/tripod/XEH_postInit.sqf b/addons/tripod/XEH_postInit.sqf index 577f0c5037..57f1fd08b0 100644 --- a/addons/tripod/XEH_postInit.sqf +++ b/addons/tripod/XEH_postInit.sqf @@ -14,6 +14,6 @@ GVAR(height) = 0; ["ace_playerVehicleChanged", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addEventHandler; // handle falling unconscious -["ace_medical_onUnconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; +[QEGVAR(medical,unconscious), {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler; // @todo captivity? diff --git a/addons/tripod/config.cpp b/addons/tripod/config.cpp index a4c205d7a9..bd2a0d0505 100644 --- a/addons/tripod/config.cpp +++ b/addons/tripod/config.cpp @@ -18,7 +18,7 @@ class CfgPatches { #include "CfgWeapons.hpp" class ACE_newEvents { - medical_onUnconscious = "ace_medical_onUnconscious"; + medical_onUnconscious = QEGVAR(medical,unconscious); playerVehicleChanged = "ace_playerVehicleChanged"; playerChanged = "ace_playerChanged"; interactMenuOpened = "ace_interactMenuOpened";