Update common event names to meet new standard

addons/advanced_ballistics/config.cpp

@@ -23,7 +23,6 @@ class ACE_Extensions {
 };
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
-};
+};

addons/captives/config.cpp

@@ -21,12 +21,10 @@ class CfgPatches {
 #include "CfgEden.hpp"
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     medical_onUnconscious = "ace_unconscious";
     SetSurrendered = QGVAR(setSurrendered);
     SetHandcuffed = QGVAR(setHandcuffed);
     MoveOutCaptive = QGVAR(moveOutCaptive);
     MoveInCaptive = QGVAR(moveInCaptive);
-    playerChanged = "ace_playerChanged";
     CaptiveStatusChanged = "ace_captiveStatusChanged";
 };

addons/cargo/config.cpp

@@ -26,6 +26,5 @@ class ACE_newEvents {
     AddCargoByClass = "ace_addCargoByClass";
     ServerUnloadCargo = QGVAR(serverUnload);
     UnloadCargo = "ace_unloadCargo";
-    hideObjectGlobal = "ace_hideObjectGlobal";
     cargoAddedByClass = "ace_cargoAddedByClass";
 };

addons/cargo/functions/fnc_loadItem.sqf

@@ -35,7 +35,7 @@ _vehicle setVariable [QGVAR(space), _space - _itemSize, true];
 if (_item isEqualType objNull) then {
     detach _item;
     _item attachTo [_vehicle,[0,0,-100]];
-    ["ace_hideObjectGlobal", [_item, true]] call CBA_fnc_serverEvent;
+    [QEGVAR(common,hideObjectGlobal), [_item, true]] call CBA_fnc_serverEvent;
 };
 
 true

addons/common/XEH_postInit.sqf

@@ -89,7 +89,7 @@ if (isServer) then {
 
 
 // Event to log Fix Headbug output
-["HeadbugFixUsed", {
+[QGVAR(headbugFixUsed), {
     params ["_profileName", "_animation"];
     ACE_LOGINFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
 }] call CBA_fnc_addEventHandler;
@@ -129,8 +129,8 @@ if (isServer) then {
 [QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
-    ["ace_hideObjectGlobal", {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
+    [QGVAR(hideObjectGlobal), {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
-    ["ace_enableSimulationGlobal", {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
+    [QGVAR(enableSimulationGlobal), {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
     ["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler;
     [QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler;
 };
@@ -143,16 +143,16 @@ if (isServer) then {
 // Synced ACE events
 // Handle JIP scenario
 if (!isServer) then {
-    ["PlayerJip", {
+    ["ace_playerJIP", {
         ACE_LOGINFO("JIP event synchronization initialized");
-        ["ace_SEH_all", [player]] call CBA_fnc_serverEvent;
+        [QGVAR(SEH_all), [player]] call CBA_fnc_serverEvent;
     }] call CBA_fnc_addEventHandler;
 } else {
-    ["ace_SEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
+    [QGVAR(SEH_all), FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
 };
 
-["ace_SEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
+[QGVAR(SEH), FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
-["ace_SEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
+[QGVAR(SEH_s), FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
     [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
@@ -221,7 +221,7 @@ call FUNC(checkFiles);
         [] call FUNC(readSettingsFromParamsArray);
     };
     // Event so that ACE_Modules have their settings loaded:
-    ["ace_initSettingsFromModules", []] call CBA_fnc_localEvent;
+    [QGVAR(initSettingsFromModules), []] call CBA_fnc_localEvent;
 
     if (isServer) then {
         // Publish all settings data after all configs and modules are read
@@ -284,7 +284,7 @@ enableCamShake true;
 //////////////////////////////////////////////////
 
 // Set the name for the current player
-["playerChanged", {
+["ace_playerChanged", {
     params ["_newPlayer","_oldPlayer"];
 
     if (alive _newPlayer) then {
@@ -475,7 +475,7 @@ if (didJip) then {
     // We are jipping! Get ready and wait, and throw the event
     [{
         if(!isNull player && GVAR(settingsInitFinished)) then {
-            ["ace_playerJip", [player]] call CBA_fnc_localEvent;
+            ["ace_playerJIP", [player]] call CBA_fnc_localEvent;
             [_this select 1] call CBA_fnc_removePerFrameHandler;
         };
     }, 0, []] call CBA_fnc_addPerFrameHandler;

addons/common/config.cpp

@@ -21,9 +21,7 @@ class ACE_newEvents {
     blockDamage = QGVAR(blockDamage);
     blockEngine = QGVAR(blockEngine);
 
-    useItem = "ace_useItem";
+    PlayerJip = "ace_playerJIP";
-    displayTextPicture = "ace_displayTextPicture";
-    displayTextStructured = "ace_displayTextStructured";
     activeCameraChanged = "ace_activeCameraChanged";
     visibleMapChanged = "ace_visibleMapChanged";
     cameraViewChanged = "ace_cameraViewChanged";
@@ -34,12 +32,19 @@ class ACE_newEvents {
     playerVehicleChanged = "ace_playerVehicleChanged";
     playerChanged = "ace_playerChanged";
     SettingsInitialized = "ace_settingsInitialized";
-    InitSettingsFromModules = "ace_initSettingsFromModules";
+
-    SEH_s = "ace_SEH_s";
+    SEH_s = QGVAR(SEH_s);
-    SEH = "ace_SEH";
+    SEH = QGVAR(SEH);
-    SEH_all = "ace_SEH_all";
+    SEH_all = QGVAR(SEH_all);
-    enableSimulationGlobal = "ace_enableSimulationGlobal";
+    setStatusEffect = QGVAR(setStatusEffect);
-    hideObjectGlobal = "ace_hideObjectGlobal";
+    HeadbugFixUsed = QGVAR(headbugFixUsed);
+    InitSettingsFromModules = QGVAR(initSettingsFromModules);
+    enableSimulationGlobal = QGVAR(enableSimulationGlobal);
+    hideObjectGlobal = QGVAR(hideObjectGlobal);
+
+    useItem = "ace_useItem";
+    displayTextPicture = "ace_displayTextPicture";
+    displayTextStructured = "ace_displayTextStructured";
     setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
     setVectorDirAndUp = "ace_setVectorDirAndUp";
     switchMove = "ace_switchMove";
@@ -56,10 +61,7 @@ class ACE_newEvents {
     fixPosition = "ace_fixPosition";
     fixFloating = "ace_fixFloating";
     fixCollision = "ace_fixCollision";
-    setStatusEffect = QGVAR(setStatusEffect);
     SettingChanged = "ace_settingChanged";
-    HeadbugFixUsed = "ace_headbugFixUsed";
-    blockDamage = "ace_blockDamage";
     firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
     firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
     firedPlayerVehicle = "ace_firedPlayerVehicle";

addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf

@@ -18,7 +18,7 @@ params ["_client"];
     private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
     _eventEntry params ["", "_eventLog"];
 
-    ["ace_SEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
+    [QGVAR(SEH_s), [_x, _eventLog], _client] call CBA_fnc_targetEvent;
     false
 } count (GVAR(syncedEvents) select 0);
 

addons/common/functions/fnc__handleRequestSyncedEvent.sqf

@@ -30,7 +30,7 @@ if (isServer) then {
     private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
     _eventEntry params ["", "_eventLog"];
 
-    ["ace_SEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
+    [QGVAR(SEH_s), [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
 } else {
     params ["_eventName", "_eventLog"];
 

addons/common/functions/fnc_headBugFix.sqf

@@ -17,8 +17,8 @@
 private _unit = ACE_player;
 private _anim = animationState _unit;
 
-["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_serverEvent;
+[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_serverEvent;
-["ace_headbugFixUsed", [profileName, _anim]] call CBA_fnc_localEvent;
+[QGVAR(headbugFixUsed), [profileName, _anim]] call CBA_fnc_localEvent;
 
 if (_unit != vehicle _unit  || {!([_unit, objNull, ["isNotSitting"]] call FUNC(canInteractWith))}) exitWith {false};
 

addons/common/functions/fnc_hideUnit.sqf

@@ -28,5 +28,5 @@ if !(_reason in _setHiddenReasons) then {
 };
 
 if !(isObjectHidden _unit) then {
-    ["ace_hideObjectGlobal", [_unit, true]] call CBA_fnc_serverEvent;
+    [QGVAR(hideObjectGlobal), [_unit, true]] call CBA_fnc_serverEvent;
 };

addons/common/functions/fnc_requestSyncedEvent.sqf

@@ -4,7 +4,7 @@
  *
  * Arguments:
  * 0: eventName <STRING>
- * 
+ *
  * Return Value:
  * Boolean of success
  *
@@ -17,4 +17,4 @@ params ["_eventName"];
 // Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
 if (isServer) exitWith {false};
 
-["ace_SEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
+[QGVAR(SEH_s), [_eventName, ACE_player]] call CBA_fnc_serverEvent;

addons/common/functions/fnc_syncedEvent.sqf

@@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
 
 private _eventData = [_name, _args, _ttl];
 
-["ace_SEH", _eventData] call CBA_fnc_globalEvent;
+[QGVAR(SEH), _eventData] call CBA_fnc_globalEvent;

addons/common/functions/fnc_unhideUnit.sqf

@@ -28,5 +28,5 @@ if (_reason in _setHiddenReasons) then {
 };
 
 if (_setHiddenReasons isEqualTo []) then {
-    ["ace_hideObjectGlobal", [_unit,false]] call CBA_fnc_serverEvent;
+    [QGVAR(hideObjectGlobal), [_unit,false]] call CBA_fnc_serverEvent;
 };

addons/disposable/config.cpp

@@ -19,7 +19,6 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 
 class ACE_newEvents {
-    playerInventoryChanged = "ace_playerInventoryChanged";
     firedNonPlayer = "ace_firedNonPlayer";
     firedPlayer = "ace_firedPlayer";
-};
+};

addons/dragging/config.cpp

@@ -19,9 +19,6 @@ class CfgPatches {
 
 class ACE_newEvents {
     medical_onUnconscious = "ace_unconscious";
-    playerWeaponChanged = "ace_playerWeaponChanged";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerChanged = "ace_playerChanged";
     setDir = "ace_setDir";
     fixFloating = "ace_fixFloating";
     fixPosition = "ace_fixPosition";

addons/finger/config.cpp

@@ -17,7 +17,3 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/frag/config.cpp

@@ -16,11 +16,10 @@ class CfgPatches {
 #include "CfgAmmo.hpp"
 #include "ACE_Settings.hpp"
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
     firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
     firedPlayerVehicle = "ace_firedPlayerVehicle";
     firedNonPlayer = "ace_firedNonPlayer";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
-};
+};

addons/gforces/config.cpp

@@ -17,7 +17,3 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/goggles/config.cpp

@@ -271,10 +271,7 @@ class CfgCloudlets {
 };
 
 class ACE_newEvents {
-    playerInventoryChanged = "ace_playerInventoryChanged";
     firedPlayer = "ace_firedPlayer";
-    activeCameraChanged = "ace_activeCameraChanged";
-    cameraViewChanged = "ace_cameraViewChanged";
     GlassesChanged = "ace_glassesChanged";
     GlassesCracked = "ace_glassesCracked";
 };

addons/hearing/XEH_postInit.sqf

@@ -28,8 +28,8 @@ GVAR(volumeAttenuation) = 1;
     [FUNC(updateVolume), 1, [false]] call CBA_fnc_addPerFrameHandler;
 
     // Update veh attunation when player veh changes
-    ["ace_playerVehicleChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler;
+    ["ace_playerVehicleChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler;
-    ["ace_playerTurretChanged", {_this call FUNC(updatePlayerVehAttenuation);}] call CBA_fnc_addEventHandler;
+    ["ace_playerTurretChanged", FUNC(updatePlayerVehAttenuation)] call CBA_fnc_addEventHandler;
 
     // Reset deafness on respawn (or remote control player switch)
     ["ace_playerChanged", {

addons/hearing/config.cpp

@@ -14,20 +14,8 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-
 #include "CfgVehicles.hpp"
-
 #include "CfgSounds.hpp"
-
 #include "CfgWeapons.hpp"
-
 #include "CfgAmmo.hpp"
-
 #include "ACE_Settings.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    playerTurretChanged = "ace_playerTurretChanged";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-};

addons/interact_menu/config.cpp

@@ -27,7 +27,6 @@ class ACE_Extensions {
 
 class ACE_newEvents {
     SettingChanged = "ace_settingChanged";
-    playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
     clearConditionCaches = QGVAR(clearConditionCaches);
     interactMenuClosed = "ace_interactMenuClosed";

addons/laserpointer/config.cpp

@@ -21,6 +21,5 @@ class CfgPatches {
 
 class ACE_newEvents {
     GunLightOff = "ace_gunLightOff";
-    SettingsInitialized = "ace_settingsInitialized";
     SetHandcuffed = QEGVAR(captives,setHandcuffed);
-};
+};

addons/map/config.cpp

@@ -164,7 +164,3 @@ class RscDisplayServerGetReady: RscDisplayGetReady {
         };
     };
 };
-
-class ACE_newEvents {
-    visibleMapChanged = "ace_visibleMapChanged";
-};

addons/map_gestures/config.cpp

@@ -16,7 +16,3 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/medical/XEH_postInit.sqf

@@ -29,7 +29,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
 [QGVAR(actionPlaceInBodyBag), FUNC(actionPlaceInBodyBag)] call CBA_fnc_addEventHandler;
 
 //Handle Deleting Bodies on Server:
-if (isServer) then {["ace_playedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;};
+if (isServer) then {["ace_placedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;};
 
 ["ace_unconscious", {
     params ["_unit", "_status"];
@@ -295,7 +295,7 @@ GVAR(lastHeartBeatSound) = CBA_missionTime;
 ["ace_playerInventoryChanged", FUNC(itemCheck)] call CBA_fnc_addEventHandler;
 
 if (hasInterface) then {
-    ["PlayerJip", {
+    ["ace_playerJIP", {
         ACE_LOGINFO("JIP Medical init for player.");
         [player] call FUNC(init);
     }] call CBA_fnc_addEventHandler;

addons/medical/config.cpp

@@ -33,7 +33,7 @@ class ACE_newEvents {
     Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard";
     medical_onLogEntryAdded = "ace_medicalLogEntryAdded";
     Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment";
-    placedInBodyBag = "ace_playedInBodyBag";
+    placedInBodyBag = "ace_placedInBodyBag";
     actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag);
     treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal);
     treatmentIVLocal = QGVAR(treatmentIVLocal);

addons/medical/functions/fnc_actionPlaceInBodyBag.sqf

@@ -47,6 +47,6 @@ private _bodyBag = createVehicle ["ACE_bodyBagObject", _position, [], 0, ""];
 _bodyBag setPosASL _position;
 _bodyBag setDir _direction;
 
-["ace_playedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server
+["ace_placedInBodyBag", [_target, _bodyBag]] call CBA_fnc_globalEvent; //hide and delete body on server
 
 _bodyBag

addons/medical/functions/fnc_serverRemoveBody.sqf

@@ -21,7 +21,7 @@ params ["_target"];
 TRACE_2("",_target,isPlayer _target);
 
 //Hide the body globaly
-["ace_hideObjectGlobal", [_target, true]] call CBA_fnc_serverEvent;
+[QEGVAR(common,hideObjectGlobal), [_target, true]] call CBA_fnc_serverEvent;
 
 if (isNil QGVAR(bodiesToDelete)) then {GVAR(bodiesToDelete) = [];};
 GVAR(bodiesToDelete) pushBack _target;

addons/mk6mortar/XEH_postInit.sqf

@@ -19,5 +19,5 @@
 
 if (!hasInterface) exitWith {};
 
-["ace_playerVehicleChanged", {_this call FUNC(handlePlayerVehicleChanged);}] call CBA_fnc_addEventHandler;
+["ace_playerVehicleChanged", FUNC(handlePlayerVehicleChanged)] call CBA_fnc_addEventHandler;
-["ace_infoDisplayChanged", {_this call FUNC(turretDisplayLoaded);}] call CBA_fnc_addEventHandler;
+["ace_infoDisplayChanged", FUNC(turretDisplayLoaded)] call CBA_fnc_addEventHandler;

addons/mk6mortar/config.cpp

@@ -36,6 +36,5 @@ class RscStructuredText;
 
 class ACE_newEvents {
     infoDisplayChanged = "ace_infoDisplayChanged";
-    playerVehicleChanged = "ace_playerVehicleChanged";
     initMortar = "ace_initMortar";
 };

addons/modules/XEH_postInit.sqf

@@ -1,7 +1,7 @@
 
 #include "script_component.hpp"
 
-["ace_initSettingsFromModules", {
+[QEGVAR(common,initSettingsFromModules), {
     // TODO This is a basic and limited implementation that mimics some of the functionality from the A3 module framework, but not all of it.
     // We have to execute this in the postInit XEH because on object init, the parameters of the modules are not yet available. They are if we execute it at the start of postInit execution.
 

addons/modules/config.cpp

@@ -27,7 +27,3 @@ class CfgVehicles {
 };
 
 #include "CfgEventHandlers.hpp"
-
-class ACE_newEvents {
-    InitSettingsFromModules = "ace_initSettingsFromModules";
-};

addons/movement/config.cpp

@@ -19,8 +19,3 @@ class CfgPatches {
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
 #include "ACE_Settings.hpp"
-
-class ACE_newEvents {
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    playerChanged = "ace_playerChanged";
-};

addons/nametags/config.cpp

@@ -18,7 +18,3 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 
 #include <RscTitles.hpp>
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/nightvision/config.cpp

@@ -19,10 +19,6 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 
 class ACE_newEvents {
-    playerVisionModeChanged = "ace_playerVisionModeChanged";
     firedPlayerVehicle = "ace_firedPlayerVehicle";
     firedPlayer = "ace_firedPlayer";
-    playerTurretChanged = "ace_playerTurretChanged";
+};
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-};

addons/noradio/XEH_postInit.sqf

@@ -11,7 +11,7 @@ if (isServer) then {
 if (!hasInterface) exitWith {};
 
 // mutes/unmutes units when the player changes
-["playerChanged", {
+["ace_playerChanged", {
     params ["_newPlayer", "_oldPlayer"];
 
     // mute the new player

addons/optionsmenu/config.cpp

@@ -40,7 +40,3 @@ class CfgCommands {
         "http://ace3mod.com/version.html"
     };
 };
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/overheating/config.cpp

@@ -52,7 +52,6 @@ class CfgGesturesMale {
     };
 };
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
     showWeaponTemperature = QGVAR(showWeaponTemperature);
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";

addons/parachute/config.cpp

@@ -19,7 +19,5 @@ class CfgPatches {
 #include "RscTitles.hpp"
 
 class ACE_newEvents {
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerInventoryChanged = "ace_playerInventoryChanged";
     infoDisplayChanged = "ace_infoDisplayChanged";
-};
+};

addons/rearm/config.cpp

@@ -21,6 +21,5 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 
 class ACE_newEvents {
-    playerVehicleChanged = "ace_playerVehicleChanged";
     medical_onUnconscious = "ace_unconscious";
 };

addons/respawn/config.cpp

@@ -20,8 +20,6 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-    playerChanged = "ace_playerChanged";
     rallypointMoved = "ace_rallypointMoved";
     killedByFriendly = "ace_killedByFriendly";
 };

addons/sandbag/config.cpp

@@ -19,9 +19,5 @@ class CfgPatches {
 
 class ACE_newEvents {
     medical_onUnconscious = "ace_unconscious";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
-    enableSimulationGlobal = "ace_enableSimulationGlobal";
 };

addons/sandbag/functions/fnc_deploy.sqf

@@ -27,7 +27,7 @@ _sandBag = createVehicle ["ACE_SandbagObject_NoGeo", [0, 0, 0], [], 0, "NONE"];
 GVAR(sandBag) = _sandBag;
 
 // prevent collisions with sandbag
-["ace_enableSimulationGlobal", [_sandBag, false]] call CBA_fnc_serverEvent;
+[QEGVAR(common,enableSimulationGlobal), [_sandBag, false]] call CBA_fnc_serverEvent;
 
 GVAR(deployDirection) = 0;
 

addons/scopes/config.cpp

@@ -24,8 +24,6 @@ class CfgPatches {
 #include "RscTitles.hpp"
 
 class ACE_newEvents {
-    cameraViewChanged = "ace_cameraViewChanged";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
-    playerInventoryChanged = "ace_playerInventoryChanged";
 };

addons/sitting/config.cpp

@@ -19,7 +19,6 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     SetHandcuffed = QEGVAR(captives,setHandcuffed);
     medical_onUnconscious = "ace_unconscious";
-};
+};

addons/tacticalladder/config.cpp

@@ -19,6 +19,4 @@ class CfgPatches {
 class ACE_newEvents {
     interactMenuOpened = "ace_interactMenuOpened";
     medical_onUnconscious = "ace_unconscious";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerChanged = "ace_playerChanged";
 };

addons/trenches/config.cpp

@@ -19,9 +19,5 @@ class CfgPatches {
 
 class ACE_newEvents {
     medical_onUnconscious = "ace_unconscious";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
-    enableSimulationGlobal = "ace_enableSimulationGlobal";
 };

addons/trenches/functions/fnc_placeTrench.sqf

@@ -36,7 +36,7 @@ _trench = createVehicle [_noGeoModel, [0, 0, 0], [], 0, "NONE"];
 GVAR(trench) = _trench;
 
 // prevent collisions with trench
-["ace_enableSimulationGlobal", [_trench, false]] call CBA_fnc_serverEvent;
+[QEGVAR(common,enableSimulationGlobal), [_trench, false]] call CBA_fnc_serverEvent;
 
 GVAR(digDirection) = 0;
 

addons/tripod/config.cpp

@@ -19,7 +19,5 @@ class CfgPatches {
 
 class ACE_newEvents {
     medical_onUnconscious = "ace_unconscious";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
 };

addons/ui/config.cpp

@@ -20,7 +20,3 @@ class CfgPatches {
 
 #include "RscChat.hpp"
 #include "RscVignette.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/vehiclelock/config.cpp

@@ -21,7 +21,6 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     VehicleLock_SetVehicleLock = QGVAR(setVehicleLock);
     VehicleLock_SetupCustomKey = QGVAR(setupCustomKey);
 };

addons/viewdistance/config.cpp

@@ -16,7 +16,3 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "ACE_Settings.hpp"
 #include "CfgVehicles.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/weaponselect/config.cpp

@@ -18,5 +18,4 @@ class CfgPatches {
 
 class ACE_newEvents {
     firedPlayer = "ace_firedPlayer";
-    displayTextPicture = "ace_displayTextPicture";
 };

addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf

@@ -26,4 +26,4 @@ private _name = getText (configFile >> "CfgMagazines" >> _magazine >> "displayNa
 private _text = [format ["%1  x%2", _name, _numberofGrenades], _color] call EFUNC(common,stringToColoredText);
 private _picture = getText (configFile >> "CfgMagazines" >> _magazine >> "picture");
 
-["ace_displayTextPicture", [_text, _picture]] call CBA_fnc_localEvent;
+[_text, _picture] call EFUNC(common,displayTextPicture);

addons/weather/config.cpp

@@ -18,7 +18,3 @@ class CfgPatches {
 #include "RscTitles.hpp"
 #include "CfgVehicles.hpp"
 #include "ACE_Settings.hpp"
-
-class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
-};

addons/winddeflection/config.cpp

@@ -26,7 +26,6 @@ class CfgAddons {
 #include "ACE_Settings.hpp"
 
 class ACE_newEvents {
-    SettingsInitialized = "ace_settingsInitialized";
     firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
     firedPlayerVehicle = "ace_firedPlayerVehicle";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";